From 1e1b2e97dabcdd0e76724a7cf6de57735aaafff8 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Fri, 24 May 2013 16:57:16 +0200 Subject: [PATCH] zapit: fix ordering of cleanup stuff Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/ba4298b119bc120aff45e997aa0caf9c25281da7 Author: Stefan Seyfried Date: 2013-05-24 (Fri, 24 May 2013) --- src/zapit/src/zapit.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp index c1e598d66..7becbd740 100644 --- a/src/zapit/src/zapit.cpp +++ b/src/zapit/src/zapit.cpp @@ -2434,13 +2434,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; @@ -2448,6 +2441,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; }