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

Merge branch 'master' into multituner

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7e469e7c4f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-01-26 (Thu, 26 Jan 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2012-01-26 19:37:46 +04:00
parent 9f8fd28001 e8469deefe
commit e83115b788
14 changed files with 189 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/channellist.cpp
View File

@@ -85,7 +85,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);
@@ -663,8 +662,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 {