From c1c734f4634e27f2dca51b3787e2a237d9418f30 Mon Sep 17 00:00:00 2001
From: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: Fri, 24 May 2013 16:57:16 +0200
Subject: [PATCH] zapit: fix ordering of cleanup stuff

---
 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 acb21edb7..53938868a 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -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;
 }