From ffb81abcb16b007cf9676dc190d56104266f8ae2 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sun, 16 Sep 2012 23:57:31 +0200 Subject: [PATCH] channellist: fix parental locking fix a merge error introduced during the twin merge (correct code was in commt af6edcdc6841e4e) Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/7a4e58e44f412be93bc73cefd4a6a511e3e756b3 Author: Stefan Seyfried Date: 2012-09-16 (Sun, 16 Sep 2012) Origin message was: ------------------ channellist: fix parental locking fix a merge error introduced during the twin merge (correct code was in commt af6edcdc6841e4e) ------------------ This commit was generated by Migit --- src/gui/channellist.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 2ded78448..bb01a65a4 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -1139,7 +1139,7 @@ void CChannelList::zapToChannel(CZapitChannel *channel) } selected_chid = channel->getChannelID(); - g_RemoteControl->zapTo_ChannelID(channel->getChannelID(), channel->getName(), !channel->bAlwaysLocked); + g_RemoteControl->zapTo_ChannelID(selected_chid, channel->getName(), (channel->bAlwaysLocked == g_settings.parentallock_defaultlocked)); CNeutrinoApp::getInstance()->channelList->adjustToChannelID(channel->getChannelID()); } if(!this->new_mode_active) {