From 2fafab9ef70ea8a143c14fcdd628e18f79dbd83e Mon Sep 17 00:00:00 2001
From: Jacek Jendrzej <overx300@gmail.com>
Date: Tue, 17 Jan 2012 20:07:13 +0000
Subject: [PATCH] dont reload chanellist after manuel reload

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2065 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: https://github.com/neutrino-images/ni-neutrino/commit/163052cd396d3634326aeb5e97b00797023f4baf
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-01-17 (Tue, 17 Jan 2012)
---
 src/gui/bouquetlist.cpp | 3 +--
 src/gui/channellist.cpp | 5 ++---
 src/gui/scan_setup.cpp  | 1 +
 src/neutrino.cpp        | 2 --
 src/neutrino.h          | 3 ++-
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp
index 7eeff4335..62774d385 100644
--- a/src/gui/bouquetlist.cpp
+++ b/src/gui/bouquetlist.cpp
@@ -57,7 +57,6 @@
 #include <neutrino.h>
 
 extern CBouquetManager *g_bouquetManager;
-extern int g_channel_list_changed;
 
 CBouquetList::CBouquetList(const char * const Name)
 {
@@ -381,7 +380,7 @@ int CBouquetList::show(bool bShowChannelList)
 		else if ( msg == CRCInput::RC_setup) {
 			int ret = doMenu();
 			if(ret > 0) {
-				g_channel_list_changed = true;
+				CNeutrinoApp::getInstance ()->g_channel_list_changed = true;
 				res = -4;
 				loop = false;
 			} else if(ret < 0)
diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index b386ebe8f..7376d6212 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -84,7 +84,6 @@ extern CBouquetList   * RADIOallList;
 
 //extern t_channel_id rec_channel_id;
 extern bool autoshift;
-extern int g_channel_list_changed;
 
 extern CBouquetManager *g_bouquetManager;
 void sectionsd_getChannelEvents(CChannelEventList &eList, const bool tv_mode, t_channel_id *chidlist, int clen);
@@ -662,8 +661,8 @@ int CChannelList::show()
 		else if ( msg == CRCInput::RC_setup) {
 			old_b_id = bouquetList->getActiveBouquetNumber();
 			fader.Stop();
-			g_channel_list_changed = doChannelMenu();
-			if(g_channel_list_changed) {
+			CNeutrinoApp::getInstance ()->g_channel_list_changed = doChannelMenu();
+			if(CNeutrinoApp::getInstance ()->g_channel_list_changed) {
 				res = -4;
 				loop = false;
 			} else {
diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp
index e8170cda5..3294c070b 100644
--- a/src/gui/scan_setup.cpp
+++ b/src/gui/scan_setup.cpp
@@ -236,6 +236,7 @@ int CScanSetup::exec(CMenuTarget* parent, const std::string &actionKey)
 		g_Zapit->reinitChannels();
 		if (reloadhintBox)
 			reloadhintBox->hide();
+		CNeutrinoApp::getInstance ()->SDTreloadChannels = false;
 		return res;
 	}
 	
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index f9fa0b1b4..63a4f6b47 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -148,8 +148,6 @@ extern cAudio * audioDecoder;
 cPowerManager *powerManager;
 cCpuFreqManager * cpuFreq;
 
-int g_channel_list_changed;
-
 void stop_daemons(bool stopall = true);
 // uncomment if you want to have a "test" menue entry  (rasc)
 
diff --git a/src/neutrino.h b/src/neutrino.h
index 79b2100cd..117a7ae90 100644
--- a/src/neutrino.h
+++ b/src/neutrino.h
@@ -130,7 +130,6 @@ private:
 //	bool				fromflash;
 	bool 				init_cec_setting;
 	int				lastChannelMode;
-	bool 				SDTreloadChannels;
 	struct timeval                  standby_pressed_at;
 
 	CZapitClient::responseGetLastChannel    firstchannel;
@@ -229,6 +228,8 @@ public:
 	void SelectSubtitles();
 	void showInfo(void);
 	CConfigFile* getConfigFile() {return &configfile;};
+	bool 		SDTreloadChannels;
+	bool 		g_channel_list_changed;
 };
 #endif