From 98e8e0f85602aba04604e6c5d095f4c16a0cc20a Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sat, 25 Feb 2012 13:58:48 +0100 Subject: [PATCH] channellist: always start video if parental lock is disabled this fixes an obscure wakeup-from-standby bug if parental locking is disabled but a bouquet is marked as "locked" anyway --- src/gui/channellist.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index cf597282f..2bbba0666 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -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);