call saveAll from within def run... so now save connectedTo configEntries

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

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index eb9de2fb3fc1fd182e151b09c79b259ccb7e1262..7d44965824f6b6b9f59aaaa6f47e0366b5e075eb 100644 (file)
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -200,6 +200,7 @@ class NimSetup(Screen, ConfigListScreen):
                                x[1].value = int(mktime(dt.timetuple()))
                        x[1].save()
                nimmanager.sec.update()
+               self.saveAll()
 
        def fillListWithAdvancedSatEntrys(self, Sat):
                currLnb = self.nimConfig.advanced.lnb[int(Sat.lnb.value)]
@@ -291,7 +292,6 @@ 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:
@@ -336,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)
@@ -358,6 +356,16 @@ class NimSetup(Screen, ConfigListScreen):
                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)