From 21f79f1284d6d14aaf2cd9099ff5fc2adaf6ae7c Mon Sep 17 00:00:00 2001
From: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: Sun, 10 Mar 2013 00:07:26 +0100
Subject: [PATCH] channellist: don't change bouquetmode when adding favs

when adding a channel to favorites from the channellist contextmenu
the favorites bouquet was chosen, which is not helpful if further
favorites should be added
---
 src/gui/channellist.cpp | 9 +++++----
 src/neutrino.cpp        | 4 +++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index 6318113e0..09ccc1253 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -433,7 +433,7 @@ int CChannelList::doChannelMenu(void)
 			}
 			if(!g_bouquetManager->existsChannelInBouquet(bouquet_id, channel_id)) {
 				CZapit::getInstance()->addChannelToBouquet(bouquet_id, channel_id);
-				return 1;
+				return 2;
 			}
 
 			break;
@@ -696,9 +696,10 @@ int CChannelList::show()
 		else if ( msg == CRCInput::RC_setup) {
 			old_b_id = bouquetList->getActiveBouquetNumber();
 			fader.Stop();
-			CNeutrinoApp::getInstance()->g_channel_list_changed = doChannelMenu();
-			if(CNeutrinoApp::getInstance()->g_channel_list_changed) {
-				res = -4;
+			int ret = doChannelMenu();
+			CNeutrinoApp::getInstance()->g_channel_list_changed = (ret != 0);
+			if (ret) {
+				res = -3 - ret; /* -5 == add to fav, -5 == all other change */
 				loop = false;
 			} else {
 				old_b_id = -1;
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 34b5addd8..64e6f64bf 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -2477,7 +2477,9 @@ _repeat:
 			//else if(nNewChannel == -4)
 			if(g_channel_list_changed)
 			{
-				SetChannelMode(old_mode);
+				/* don't change bouquet after adding a channel to favorites */
+				if (nNewChannel != -5)
+					SetChannelMode(old_mode);
 				g_channel_list_changed = 0;
 				if(old_b_id < 0) old_b_id = old_b;
 				//g_Zapit->saveBouquets();