mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 17:01:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

zapit: fix ordering of cleanup stuff

Browse Source
This commit is contained in:
Stefan Seyfried
2013-05-24 16:57:16 +02:00
parent 6d64dfa134
commit c1c734f463
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/zapit/src/zapit.cpp
View File

@@ -2537,13 +2537,6 @@ void CZapit::run()
INFO("demuxes/decoders deleted"); INFO("demuxes/decoders deleted");
delete CFEManager::getInstance();
INFO("frontend(s) deleted");
if (ca) {
INFO("stopping CA");
ca->Stop();
delete ca;
}
#ifdef EXIT_CLEANUP #ifdef EXIT_CLEANUP
INFO("cleanup..."); INFO("cleanup...");
delete eventServer; delete eventServer;
@@ -2551,6 +2544,13 @@ void CZapit::run()
delete CServiceManager::getInstance(); delete CServiceManager::getInstance();
delete CServiceScan::getInstance(); delete CServiceScan::getInstance();
#endif #endif
delete CFEManager::getInstance();
INFO("frontend(s) deleted");
if (ca) {
INFO("stopping CA");
ca->Stop();
delete ca;
}
INFO("shutdown complete"); INFO("shutdown complete");
return; return;
} }