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

zapit: fix ordering of cleanup stuff

Browse Source 
Origin commit data
------------------
Commit: ba4298b119
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-24 (Fri, 24 May 2013)
This commit is contained in:
Stefan Seyfried
2013-05-24 16:57:16 +02:00
committed by [CST] Focus
parent bb52ce2f56
commit 1e1b2e97da
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

@@ -2434,13 +2434,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;
@@ -2448,6 +2441,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;
} }