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

channellist: always start video if parental lock is disabled

Browse Source 
this fixes an obscure wakeup-from-standby bug if parental locking is
disabled but a bouquet is marked as "locked" anyway


Origin commit data
------------------
Branch: ni/coolstream
Commit: 98e8e0f856
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-02-25 (Sat, 25 Feb 2012)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2012-02-25 13:58:48 +01:00
parent 65247b3b6c
commit 3dcd1f939f
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/channellist.cpp
View File

@@ -1191,7 +1191,9 @@ void CChannelList::zapTo(int pos, bool /* forceStoreToLastChannels */)
tuned = pos;
CVFD::getInstance()->setEPGTitle("");
CVFD::getInstance()->showServicename(chan->name);
g_RemoteControl->zapTo_ChannelID(chan->channel_id, chan->name, (chan->bAlwaysLocked == g_settings.parentallock_defaultlocked));
g_RemoteControl->zapTo_ChannelID(chan->channel_id, chan->name,
(chan->bAlwaysLocked == g_settings.parentallock_defaultlocked ||
g_settings.parentallock_prompt == PARENTALLOCK_PROMPT_NEVER));
// TODO check is it possible bouquetList is NULL ?
if (bouquetList != NULL) {
CNeutrinoApp::getInstance()->channelList->adjustToChannelID(chan->channel_id);
@@ -1231,7 +1233,9 @@ void CChannelList::NewZap(t_channel_id channel_id)
CVFD::getInstance()->setEPGTitle("");
CVFD::getInstance()->showServicename(chan->name);
selected_chid = chan->getChannelID();
g_RemoteControl->zapTo_ChannelID(selected_chid, chan->name, (chan->bAlwaysLocked == g_settings.parentallock_defaultlocked));
g_RemoteControl->zapTo_ChannelID(chan->channel_id, chan->name,
(chan->bAlwaysLocked == g_settings.parentallock_defaultlocked ||
g_settings.parentallock_prompt == PARENTALLOCK_PROMPT_NEVER));
/* remove recordModeActive from infobar */
if(g_settings.auto_timeshift && !CNeutrinoApp::getInstance()->recordingstatus) {
g_InfoViewer->handleMsg(NeutrinoMessages::EVT_RECORDMODE, 0);