mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-02 18:31:12 +02:00
CNeutrinoApp: fix rebase error
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:
@@ -2499,7 +2499,7 @@ int CNeutrinoApp::showChannelList(const neutrino_msg_t _msg, bool from_menu)
|
||||
channelList_allowed = true;
|
||||
return menu_return::RETURN_NONE;
|
||||
}
|
||||
channelList_painted = false;
|
||||
channelList_painted = true;
|
||||
|
||||
neutrino_msg_t msg = _msg;
|
||||
InfoClock->enableInfoClock(false);
|
||||
@@ -2591,7 +2591,7 @@ _repeat:
|
||||
SetChannelMode(LIST_MODE_FAV);
|
||||
}
|
||||
|
||||
channelList_painted = true;
|
||||
channelList_painted = false;
|
||||
|
||||
if (!from_menu)
|
||||
InfoClock->enableInfoClock(true);
|
||||
|
Reference in New Issue
Block a user