fix crash with enabled parentalcontrol in some conditions (i.e. when try to add a...

refs bug #607

diff --git a/lib/python/Components/ParentalControl.py b/lib/python/Components/ParentalControl.py
index d320c9cdf0d0bc06784491d9dba7917190661260..0ea65cd2cf1c7e70e86b78ef03e6e8c044ea9610 100644 (file)
--- 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 1c05bbf322be7565623aed8cbb5267f60350e133..c872bce9db6a94e8d5f5c368256d67b902a9a858 100644 (file)
--- 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