mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 08:21:07 +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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 21f79f1284
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-03-10 00:07:26 +01:00
parent ae1bbd7cd0
commit 1af2024dda
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)) {
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;

2
src/neutrino.cpp
View File

@@ -2477,6 +2477,8 @@ _repeat:
//else if(nNewChannel == -4)
if(g_channel_list_changed)
{
/* 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;