properly use rcused config element

[enigma2.git] / lib / python / Screens / Satconfig.py

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index d2ff975b50922283a7a826f36d6d33b61f6bc1c9..22b80f623625f1ebe62c81e3486bdd46e802a7dc 100644 (file)
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -291,6 +291,7 @@ class NimSetup(Screen, ConfigListScreen):
                self.unconfed_sats = old_configured_sats - new_configured_sats
                self.satpos_to_remove = None
                self.deleteConfirmed(False)
+               self.saveAll()
 
        def deleteConfirmed(self, confirmed):
                if confirmed:
@@ -335,8 +336,6 @@ class NimSetup(Screen, ConfigListScreen):
                self.nimConfig = self.nim.config
                self.createConfigMode()
                self.createSetup()
-               # safeAll is needed, so that keyCancel works properly
-               ConfigListScreen.saveAll(self)
 
        def keyLeft(self):
                ConfigListScreen.keyLeft(self)
@@ -356,7 +355,17 @@ class NimSetup(Screen, ConfigListScreen):
                        self.nimConfig.connectedTo.setChoices(choices)
                for x in self["config"].list:
                        x[1].save()
+                       
+       def cancelConfirm(self, result):
+               if not result:
+                       return
 
+               for x in self["config"].list:
+                       x[1].cancel()
+               # we need to call saveAll to reset the connectedTo choices
+               self.saveAll()
+               self.close()
+                       
 class NimSelection(Screen):
        def __init__(self, session):
                Screen.__init__(self, session)