mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

channellist: fix parental locking

Browse Source 
fix a merge error introduced during the twin merge (correct
code was in commt af6edcdc68)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a4e58e44f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
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 af6edcdc68)


------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2012-09-16 23:57:31 +02:00
parent 9eaeb2866d
commit ffb81abcb1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/channellist.cpp
View File

@@ -1139,7 +1139,7 @@ void CChannelList::zapToChannel(CZapitChannel *channel)
} }
selected_chid = channel->getChannelID(); 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()); CNeutrinoApp::getInstance()->channelList->adjustToChannelID(channel->getChannelID());
} }
if(!this->new_mode_active) { if(!this->new_mode_active) {