diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2010-11-01 10:22:21 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2010-11-01 10:24:55 +0100 |
| commit | 029a484112d0a57bd3706baa9ec0c5407d19af11 (patch) | |
| tree | 7bee2190cfa10001da5f051d6c418f53aa2071da /lib/python | |
| parent | 3e7f95bfc029efaf84ff42f7664b5c66244cf1a2 (diff) | |
| download | enigma2-029a484112d0a57bd3706baa9ec0c5407d19af11.tar.gz enigma2-029a484112d0a57bd3706baa9ec0c5407d19af11.zip | |
fix crash with enabled parentalcontrol in some conditions (i.e. when try to add a channel to bouquet/favourites)
refs bug #607
Diffstat (limited to 'lib/python')
| -rw-r--r-- | lib/python/Components/ParentalControl.py | 2 | ||||
| -rw-r--r-- | lib/python/Screens/ChannelSelection.py | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/lib/python/Components/ParentalControl.py b/lib/python/Components/ParentalControl.py index d320c9cd..0ea65cd2 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 1c05bbf3..c872bce9 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 |