From: ghost Date: Wed, 6 Oct 2010 10:02:02 +0000 (+0200) Subject: Merge branch 'bug_533_fix_crash_on_satconfig_close' X-Git-Tag: 3.0.0~75 X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/5928c8c18abacbedd119752fe294a9393da6d2f7?hp=9ec5fc545cfff7addbfd5b50ee9d6d60ab419e0d Merge branch 'bug_533_fix_crash_on_satconfig_close' --- 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 = [ ]