mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 09:51:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

try to fix segfault on webtv channel - neutrino shutdown

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: b22625aa36
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-11-13 (Thu, 13 Nov 2014)

Origin message was:
------------------
-try to fix segfault on webtv channel - neutrino shutdown

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2014-11-13 15:38:30 +01:00
parent cfeb94de70
commit c5f4e00058
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/driver/record.cpp
View File

@@ -809,6 +809,9 @@ CRecordManager::~CRecordManager()
} }
nextmap.clear(); nextmap.clear();
durations.clear(); durations.clear();
sm.lock();
manager = NULL;
sm.unlock();
} }
CRecordManager * CRecordManager::getInstance() CRecordManager * CRecordManager::getInstance()

6
src/neutrino.cpp
View File

@@ -3199,9 +3199,6 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode)
} }
delete cHddStat::getInstance();
delete CRecordManager::getInstance();
dprintf(DEBUG_INFO, "exit\n"); dprintf(DEBUG_INFO, "exit\n");
StopSubtitles(); StopSubtitles();
stopPlayBack(); stopPlayBack();
@@ -3209,6 +3206,9 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode)
frameBuffer->paintBackground(); frameBuffer->paintBackground();
videoDecoder->ShowPicture(DATADIR "/neutrino/icons/shutdown.jpg"); videoDecoder->ShowPicture(DATADIR "/neutrino/icons/shutdown.jpg");
delete cHddStat::getInstance();
delete CRecordManager::getInstance();
CEpgScan::getInstance()->Stop(); CEpgScan::getInstance()->Stop();
if(g_settings.epg_save /* && timeset && g_Sectionsd->getIsTimeSet ()*/) { if(g_settings.epg_save /* && timeset && g_Sectionsd->getIsTimeSet ()*/) {
g_Sectionsd->setPauseScanning(true); g_Sectionsd->setPauseScanning(true);