From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Sat, 7 Nov 2009 12:53:02 +0000 (+0100)
Subject: Merge branch 'master' of git.opendreambox.org:/git/enigma2
X-Git-Tag: 2.7.0~56
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/d883e2231e61eaeed7929088f249334a66731b77?hp=1a311d72f9c0d6edc753286cd1cdc2304b85c52d

Merge branch 'master' of git.opendreambox.org:/git/enigma2
---

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 47325327..1dff777a 100644
--- 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)
-#			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"
diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 9ef6dd94..d15c232b 100755
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -1184,7 +1184,6 @@ class ConfigSatlist(ConfigSelection):
 	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]