From 6e9496b18f9bf348730639c8639b79fc933abcf0 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sun, 8 Feb 2015 17:33:25 +0100 Subject: [PATCH] fix parentallock for "bouquets default locked" case in case of "default locked" bouquets, the "whole bouquet unlock" did not work, because of the inverted logic in this case --- src/gui/channellist.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 2451af450..fb454cc61 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -2,7 +2,7 @@ Neutrino-GUI - DBoxII-Project Copyright (C) 2001 Steffen Hehn 'McClean' - Copyright (C) 2007-2012 Stefan Seyfried + Copyright (C) 2007-2015 Stefan Seyfried Kommentar: @@ -1048,7 +1048,8 @@ int CChannelList::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data, (*chanlist)[selected]->last_unlocked_time = time_monotonic(); int bnum = bouquetList->getActiveBouquetNumber(); /* unlock only real locked bouquet, not whole satellite or all channels! */ - if (bnum >= 0 && bouquetList->Bouquets[bnum]->zapitBouquet && bouquetList->Bouquets[bnum]->zapitBouquet->bLocked) + if (bnum >= 0 && bouquetList->Bouquets[bnum]->zapitBouquet && + bouquetList->Bouquets[bnum]->zapitBouquet->bLocked != g_settings.parentallock_defaultlocked) { /* unlock the whole bouquet */ int i;