aboutsummaryrefslogtreecommitdiff
path: root/lib/python
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2010-10-06 12:02:02 +0200
committerghost <andreas.monzner@multimedia-labs.de>2010-10-06 12:02:02 +0200
commit5928c8c18abacbedd119752fe294a9393da6d2f7 (patch)
tree0c973e966fe0cd6790ba6f78e4eb2cc751090121 /lib/python
parent9ec5fc545cfff7addbfd5b50ee9d6d60ab419e0d (diff)
parent3f34006c270bc0b6de4d65edf7d46ae54c87774c (diff)
downloadenigma2-5928c8c18abacbedd119752fe294a9393da6d2f7.tar.gz
enigma2-5928c8c18abacbedd119752fe294a9393da6d2f7.zip
Merge branch 'bug_533_fix_crash_on_satconfig_close'
Diffstat (limited to 'lib/python')
-rw-r--r--lib/python/Screens/Satconfig.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index 87d65e54..749c09db 100644
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -360,7 +360,6 @@ class NimSetup(Screen, ConfigListScreen, ServiceStopScreen):
new_configured_sats = nimmanager.getConfiguredSats()
self.unconfed_sats = old_configured_sats - new_configured_sats
self.satpos_to_remove = None
- self.restoreService(_("Zap back to service before tuner setup?"))
self.deleteConfirmed((None, "no"))
def deleteConfirmed(self, confirmed):
@@ -390,7 +389,9 @@ class NimSetup(Screen, ConfigListScreen, ServiceStopScreen):
if confirmed[1] == "yestoall" or confirmed[1] == "notoall":
self.deleteConfirmed(confirmed)
break
-
+ else:
+ self.restoreService(_("Zap back to service before tuner setup?"))
+
def __init__(self, session, slotid):
Screen.__init__(self, session)
self.list = [ ]