From 699b940aa0a2e8e7ae21c1319d0c5d69d57279cc Mon Sep 17 00:00:00 2001 From: ghost Date: Mon, 1 Nov 2010 10:22:21 +0100 Subject: [PATCH] fix crash with enabled parentalcontrol in some conditions (i.e. when try to add a channel to bouquet/favourites) refs bug #607 --- lib/python/Components/ParentalControl.py | 2 -- lib/python/Screens/ChannelSelection.py | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/python/Components/ParentalControl.py b/lib/python/Components/ParentalControl.py index d320c9c..0ea65cd 100644 --- a/lib/python/Components/ParentalControl.py +++ b/lib/python/Components/ParentalControl.py @@ -20,8 +20,6 @@ IMG_WHITEBOUQUET = LIST_WHITELIST + "-" + TYPE_BOUQUET IMG_BLACKSERVICE = LIST_BLACKLIST + "-" + TYPE_SERVICE IMG_BLACKBOUQUET = LIST_BLACKLIST + "-" + TYPE_BOUQUET -parentalControl = None - def InitParentalControl(): global parentalControl parentalControl = ParentalControl() diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py index 1c05bbf..c872bce 100644 --- a/lib/python/Screens/ChannelSelection.py +++ b/lib/python/Screens/ChannelSelection.py @@ -20,7 +20,6 @@ from Components.Sources.ServiceEvent import ServiceEvent profile("ChannelSelection.py 2.3") from Components.Input import Input profile("ChannelSelection.py 3") -from Components.ParentalControl import parentalControl from Components.ChoiceList import ChoiceList, ChoiceEntryComponent from Components.SystemInfo import SystemInfo from Screens.InputBox import InputBox, PinInput @@ -77,6 +76,7 @@ def append_when_current_valid(current, menu, args, level = 0, key = ""): class ChannelContextMenu(Screen): def __init__(self, session, csel): + from Components.ParentalControl import parentalControl Screen.__init__(self, session) #raise Exception("we need a better summary screen here") self.csel = csel -- 2.7.4