zapit: fix ordering of cleanup stuff

Origin commit data
------------------
Commit: c1c734f463
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
parent 5f7d593ade
commit 3ba3f65962

View File

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