From d2f5ec90c17697a7aa6cbe0a94bd335219d86b60 Mon Sep 17 00:00:00 2001
From: seife <seife@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: Sun, 7 Feb 2010 19:17:40 +0000
Subject: [PATCH] neutrino: fix segfault on restart

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@298 e54a6e83-5905-42d5-8d5c-058d10e6a962
---
 src/neutrino.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index cabda1e5c..8336164fa 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -4178,18 +4178,20 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
 			networkConfig.commitConfig();
 			saveSetup(NEUTRINO_SETTINGS_FILE);
 
+			/* this is an ugly mess :-( */
 			delete g_RCInput;
 			delete g_Sectionsd;
-			delete g_Timerd;
 			delete g_RemoteControl;
 			delete g_fontRenderer;
-			delete g_Zapit;
-			delete CVFD::getInstance();
 
 			delete hintBox;
 			delete frameBuffer;
 
 			stop_daemons();
+			/* g_Timerd, g_Zapit and CVFD are used in stop_daemons */
+			delete g_Timerd;
+			delete g_Zapit;
+			delete CVFD::getInstance();
 
 			execvp(global_argv[0], global_argv); // no return if successful
 			exit(1);