mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

channellist: don't change bouquetmode when adding favs

Browse Source 
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
This commit is contained in:
Stefan Seyfried
2013-03-10 00:07:26 +01:00
parent d6260e3862
commit 21f79f1284
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/channellist.cpp
View File

@@ -433,7 +433,7 @@ int CChannelList::doChannelMenu(void)
} }
if(!g_bouquetManager->existsChannelInBouquet(bouquet_id, channel_id)) { if(!g_bouquetManager->existsChannelInBouquet(bouquet_id, channel_id)) {
CZapit::getInstance()->addChannelToBouquet(bouquet_id, channel_id); CZapit::getInstance()->addChannelToBouquet(bouquet_id, channel_id);
return 1; return 2;
} }
break; break;
@@ -696,9 +696,10 @@ int CChannelList::show()
else if ( msg == CRCInput::RC_setup) { else if ( msg == CRCInput::RC_setup) {
old_b_id = bouquetList->getActiveBouquetNumber(); old_b_id = bouquetList->getActiveBouquetNumber();
fader.Stop(); fader.Stop();
CNeutrinoApp::getInstance()->g_channel_list_changed = doChannelMenu(); int ret = doChannelMenu();
if(CNeutrinoApp::getInstance()->g_channel_list_changed) { CNeutrinoApp::getInstance()->g_channel_list_changed = (ret != 0);
res = -4; if (ret) {
res = -3 - ret; /* -5 == add to fav, -5 == all other change */
loop = false; loop = false;
} else { } else {
old_b_id = -1; old_b_id = -1;

4
src/neutrino.cpp
View File

@@ -2477,7 +2477,9 @@ _repeat:
//else if(nNewChannel == -4) //else if(nNewChannel == -4)
if(g_channel_list_changed) 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; g_channel_list_changed = 0;
if(old_b_id < 0) old_b_id = old_b; if(old_b_id < 0) old_b_id = old_b;
//g_Zapit->saveBouquets(); //g_Zapit->saveBouquets();