mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 07:51:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

channellist: move avoid-zap-in-movieplayer-mode-message ...

Browse Source 
... to a global reachable place to avoid all zap tries


Origin commit data
------------------
Branch: ni/coolstream
Commit: 984e187855
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-29 (Sun, 29 Jul 2018)

Origin message was:
------------------
- channellist: move avoid-zap-in-movieplayer-mode-message ...

... to a global reachable place to avoid all zap tries


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-07-29 00:54:55 +02:00
parent 5457dfdaa1
commit 5a07187270
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/channellist.cpp
View File

@@ -778,8 +778,6 @@ int CChannelList::show()
actzap = true;
oldselected = selected;
paintBody(); // refresh zapped vs selected
} else if (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_ts) {
ShowHint(LOCALE_MESSAGEBOX_INFO, LOCALE_MOVIEPLAYER_ZAP);
} else if(SameTP()) {
zapOnExit = true;
loop=false;
@@ -960,10 +958,6 @@ int CChannelList::show()
printf("CChannelList:: bouquetList->exec res %d\n", res);
}
if(NeutrinoModes::mode_ts == CNeutrinoApp::getInstance()->getMode())
return -1;
if(zapOnExit)
res = selected;
@@ -1208,6 +1202,12 @@ void CChannelList::zapToChannel(CZapitChannel *channel, bool force)
if(channel == NULL)
return;
if (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_ts)
{
ShowHint(LOCALE_MESSAGEBOX_INFO, LOCALE_MOVIEPLAYER_ZAP);
return;
}
/* we record when we switched away from a channel, so that the parental-PIN code can
check for timeout. last_unlocked_time == 0 means: the PIN was not entered
"tuned" is the *old* channel, before zap */