From 8adb6480856f412e1d58e506e3db26ea22f6d083 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Mon, 18 Oct 2021 18:25:57 +0200 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. Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/e30d00c4c0493c72596a25244afca4c1a152c3c3 Author: Stefan Seyfried Date: 2021-10-18 (Mon, 18 Oct 2021) --- 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 9abb3b592..4952bc1b3 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -1264,7 +1264,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 */) {