lib/python/Screens/Satconfig.py: fixed crash on satconfig close in some conditions...
authorghost <andreas.monzner@multimedia-labs.de>
Sat, 8 May 2010 09:14:01 +0000 (11:14 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Sat, 8 May 2010 09:14:01 +0000 (11:14 +0200)
this fixes bug #533

lib/python/Screens/Satconfig.py

index 87d65e5..749c09d 100644 (file)
@@ -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 = [ ]