mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-30 00:41:17 +02:00
- channellist: fix formatation of new code from "add primetime feature to channellist"
Conflicts: src/gui/channellist.cpp Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
@@ -873,10 +873,12 @@ int CChannelList::show()
|
||||
#if 0
|
||||
if (g_settings.channellist_additional)
|
||||
displayList = !displayList;
|
||||
else {
|
||||
else
|
||||
{
|
||||
if (primetime && displayNext)
|
||||
primetime = 0;
|
||||
else {
|
||||
else
|
||||
{
|
||||
primetime = 0;
|
||||
displayNext = !displayNext;
|
||||
}
|
||||
@@ -901,10 +903,12 @@ int CChannelList::show()
|
||||
oldselected = selected;
|
||||
paint();
|
||||
} else {
|
||||
if (g_settings.channellist_primetime) {
|
||||
if (g_settings.channellist_primetime)
|
||||
{
|
||||
if (displayNext && !primetime)
|
||||
primetime = 1;
|
||||
else {
|
||||
else
|
||||
{
|
||||
primetime = 1;
|
||||
displayNext = !displayNext;
|
||||
}
|
||||
@@ -1861,7 +1865,8 @@ void CChannelList::paintButtonBar(bool is_current)
|
||||
Button[bcnt].locale = LOCALE_INFOVIEWER_NOW;
|
||||
else
|
||||
Button[bcnt].locale = LOCALE_CHANNELLIST_PRIMETIME;
|
||||
} else
|
||||
}
|
||||
else
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user