mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

CNeutrinoApp: fix rebase error

Browse Source 
comes with: CNeutrinoApp: rework switch handling for channallist paint


Origin commit data
------------------
Branch: ni/coolstream
Commit: 17b7cc98b2
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-04-02 (Thu, 02 Apr 2015)



------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2015-04-02 09:43:52 +02:00
parent dabf8d2d8c
commit a6d20bcabf
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/neutrino.cpp
View File

@@ -2499,7 +2499,7 @@ int CNeutrinoApp::showChannelList(const neutrino_msg_t _msg, bool from_menu)
channelList_allowed = true; channelList_allowed = true;
return menu_return::RETURN_NONE; return menu_return::RETURN_NONE;
} }
channelList_painted = false; channelList_painted = true;
neutrino_msg_t msg = _msg; neutrino_msg_t msg = _msg;
InfoClock->enableInfoClock(false); InfoClock->enableInfoClock(false);
@@ -2591,7 +2591,7 @@ _repeat:
SetChannelMode(LIST_MODE_FAV); SetChannelMode(LIST_MODE_FAV);
} }
channelList_painted = true; channelList_painted = false;
if (!from_menu) if (!from_menu)
InfoClock->enableInfoClock(true); InfoClock->enableInfoClock(true);