fixes bug #258 (again)

sorting of satlist moved to another, not so destructive state

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 4732532734af0632c838d33c65c46025d47528e2..1dff777af3189fa1f4f404cfa1ecbbecbdda2702 100644 (file)
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -565,9 +565,10 @@ class NimManager:
                if self.hasNimType("DVB-S"):
                        print "Reading satellites.xml"
                        db.readSatellites(self.satList, self.satellites, self.transponders)
                if self.hasNimType("DVB-S"):
                        print "Reading satellites.xml"
                        db.readSatellites(self.satList, self.satellites, self.transponders)

-#                      print "SATLIST", self.satList
-#                      print "SATS", self.satellites
-#                      print "TRANSPONDERS", self.transponders
+                       self.satList.sort(key = lambda x: x[0]) # sort by orbpos
+                       #print "SATLIST", self.satList
+                       #print "SATS", self.satellites
+                       #print "TRANSPONDERS", self.transponders

 
                if self.hasNimType("DVB-C"):
                        print "Reading cables.xml"
 
                if self.hasNimType("DVB-C"):
                        print "Reading cables.xml"

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index cf2c5e2961a333ee700bcbc1d82f541a91ccf252..baa6c35ba77ae41922c6d8cdbf8b3e90874312e0 100755 (executable)
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -1148,7 +1148,6 @@ class ConfigSatlist(ConfigSelection):
        def __init__(self, list, default = None):
                if default is not None:
                        default = str(default)
        def __init__(self, list, default = None):
                if default is not None:
                        default = str(default)

-               list.sort(key = lambda x: int(x[0]))

                self._satList = list
                choices = [(str(orbpos), desc) for (orbpos, desc, flags) in list]
                
                self._satList = list
                choices = [(str(orbpos), desc) for (orbpos, desc, flags) in list]