From c0c008190eef1c7e67bb07f5052ebae8ad3f3147 Mon Sep 17 00:00:00 2001
From: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: Sun, 14 Apr 2013 19:42:28 +0200
Subject: [PATCH] neutrino: make g_channel_list_changed private

Add a setter function MarkChannelListChanged() instead for
bouquet/channel list. This avoids sometimes not reloading
channels after changes in the service menu.
---
 src/gui/bouquetlist.cpp | 2 +-
 src/gui/channellist.cpp | 3 ++-
 src/neutrino.cpp        | 4 ++--
 src/neutrino.h          | 3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp
index a419cf70f..c178c89a1 100644
--- a/src/gui/bouquetlist.cpp
+++ b/src/gui/bouquetlist.cpp
@@ -423,7 +423,7 @@ int CBouquetList::show(bool bShowChannelList)
 			if (!Bouquets.empty()) {
 				int ret = doMenu();
 				if(ret > 0) {
-					CNeutrinoApp::getInstance ()->g_channel_list_changed = true;
+					CNeutrinoApp::getInstance()->MarkChannelListChanged();
 					res = -4;
 					loop = false;
 				} else if(ret < 0)
diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index f8588c414..7f08a50ea 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -700,7 +700,8 @@ int CChannelList::show()
 			old_b_id = bouquetList->getActiveBouquetNumber();
 			fader.Stop();
 			int ret = doChannelMenu();
-			CNeutrinoApp::getInstance()->g_channel_list_changed = (ret != 0);
+			if (ret != 0)
+				CNeutrinoApp::getInstance()->MarkChannelListChanged();
 			if (ret == 1) {
 				res = -3 - ret; /* -5 == add to fav or bouquet, -4 == all other change */
 				loop = false;
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index ea457104e..c8b9f5ef5 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -212,7 +212,7 @@ CNeutrinoApp::CNeutrinoApp()
 	lockStandbyCall         = false;
 	current_muted		= 0;
 	recordingstatus		= 0;
-	g_channel_list_changed	= 0;
+	g_channel_list_changed	= false;
 	memset(&font, 0, sizeof(neutrino_font_descr_struct));
 }
 
@@ -2419,7 +2419,7 @@ _repeat:
 				/* don't change bouquet after adding a channel to favorites */
 				if (nNewChannel != -5)
 					SetChannelMode(old_mode);
-				g_channel_list_changed = 0;
+				g_channel_list_changed = false;
 				if(old_b_id < 0) old_b_id = old_b;
 				//g_Zapit->saveBouquets();
 				/* lets do it in sync */
diff --git a/src/neutrino.h b/src/neutrino.h
index a8caa28ab..76f891516 100644
--- a/src/neutrino.h
+++ b/src/neutrino.h
@@ -121,6 +121,7 @@ private:
 	bool 				skipSleepTimer;
 	bool                            lockStandbyCall;
 	bool 				pbBlinkChange;
+	bool				g_channel_list_changed;
 	int tvsort[LIST_MODE_LAST];
 	int radiosort[LIST_MODE_LAST];
 
@@ -219,6 +220,7 @@ public:
 		return lastChannelMode;
 	};
 	void SetChannelMode(int mode);
+	void MarkChannelListChanged(void) { g_channel_list_changed = true; };
 	void quickZap(int msg);
 	void numericZap(int msg);
 	void StopSubtitles();
@@ -228,7 +230,6 @@ public:
 	void showInfo(void);
 	CConfigFile* getConfigFile() {return &configfile;};
 	bool 		SDTreloadChannels;
-	bool 		g_channel_list_changed;
 };
 #endif