sync spaces & CR

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

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index 49de8c829d150f4f6770321e61769502d3d64372..1e3cbd513f181f85a120d0035d035ef2d033dfef 100644 (file)
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -9,12 +9,11 @@ from Components.config import getConfigListEntry
 
 class NimSetup(Screen):
        def createSimpleSetup(self, nim, list, mode):
-
                if mode == 0:                   #single Sat
                        list.append(getConfigListEntry("Satellite", config.Nims[nim.slotid].diseqcA))
                else:                                                   # > 1 Sats
                        list.append(getConfigListEntry("Port A", config.Nims[nim.slotid].diseqcA))
-               
+
                if mode >= 1:                   # > 1 Sats
                        list.append(getConfigListEntry("Port B", config.Nims[nim.slotid].diseqcB))
                        if mode >= 3:           # > 2 Sats
@@ -54,7 +53,9 @@ class NimSetup(Screen):
                self.newConfig()
 
        def keyRight(self):
-               self["config"].handleKey(config.key["nextElement"])
+               #forbid to enable advanced mode until its ready
+               if self["config"].getCurrent()[0] != "Configmode":
+                       self["config"].handleKey(config.key["nextElement"])
                self.newConfig()
 
        def keyNumberGlobal(self, number):
@@ -65,6 +66,7 @@ class NimSetup(Screen):
        def keySave(self):
                for x in self["config"].list:
                        x[1].save()
+               nimmanager.sec.update() 
                self.close()
 
        def keyCancel(self):
@@ -75,7 +77,7 @@ class NimSetup(Screen):
        def __init__(self, session, nim):
                Screen.__init__(self, session)
                self.nim = nim
-
+               
                self["actions"] = NumberActionMap(["SetupActions"],
                {
                        "ok": self.keySave,
@@ -83,15 +85,15 @@ class NimSetup(Screen):
                        "left": self.keyLeft,
                        "right": self.keyRight,
                        "1": self.keyNumberGlobal,
-            "2": self.keyNumberGlobal,
-            "3": self.keyNumberGlobal,
-            "4": self.keyNumberGlobal,
-            "5": self.keyNumberGlobal,
-            "6": self.keyNumberGlobal,
-            "7": self.keyNumberGlobal,
-            "8": self.keyNumberGlobal,
-            "9": self.keyNumberGlobal,
-            "0": self.keyNumberGlobal
+                       "2": self.keyNumberGlobal,
+                       "3": self.keyNumberGlobal,
+                       "4": self.keyNumberGlobal,
+                       "5": self.keyNumberGlobal,
+                       "6": self.keyNumberGlobal,
+                       "7": self.keyNumberGlobal,
+                       "8": self.keyNumberGlobal,
+                       "9": self.keyNumberGlobal,
+                       "0": self.keyNumberGlobal
                }, -1)
 
                self.list = [ ]