From 715ceb38e7f45275f2ab774965990754723a295d Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sat, 13 Mar 2021 20:08:14 +0100 Subject: [PATCH] channellist::zapToChannel: speed up playback on channels without EPG on pre-locked bouquets, playback was delayed until EPG times out (about 10seconds), even if parental control is globally disabled. Check for parentallock global setting and start video always if enabled. --- src/gui/channellist.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index e8649d22c..d419029d4 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -1262,7 +1262,9 @@ void CChannelList::zapToChannel(CZapitChannel *channel, bool force) } selected_chid = channel->getChannelID(); - g_RemoteControl->zapTo_ChannelID(selected_chid, channel->getName(), channel->number, (channel->Locked() == g_settings.parentallock_defaultlocked)); + bool startvideo = (g_settings.parentallock_prompt == PARENTALLOCK_PROMPT_NEVER) || + (channel->Locked() == g_settings.parentallock_defaultlocked); + g_RemoteControl->zapTo_ChannelID(selected_chid, channel->getName(), channel->number, startvideo); CNeutrinoApp::getInstance()->adjustToChannelID(channel->getChannelID()); } if(new_zap_mode != 2 /* not active */) {