X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/cfeea5d7bda036654206eefdb2ae96b03bd31969..835d4ae513afbbb62c7739070ef3c23eade22e62:/lib/python/Components/NimManager.py

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 70cde47c..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"
@@ -799,15 +800,15 @@ class NimManager:
 				dm = nim.diseqcMode.value
 				if dm in ("single", "toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"):
 					if nim.diseqcA.orbital_position != 3601:
-						list.append(self.satList[nim.diseqcA.index-1])
+						list.append(nim.diseqcA.getSat())
 				if dm in ("toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"):
 					if nim.diseqcB.orbital_position != 3601:
-						list.append(self.satList[nim.diseqcB.index-1])
+						list.append(nim.diseqcB.getSat())
 				if dm == "diseqc_a_b_c_d":
 					if nim.diseqcC.orbital_position != 3601:
-						list.append(self.satList[nim.diseqcC.index-1])
+						list.append(nim.diseqcC.getSat())
 					if nim.diseqcD.orbital_position != 3601:
-						list.append(self.satList[nim.diseqcD.index-1])
+						list.append(nim.diseqcD.getSat())
 				if dm == "positioner":
 					for x in self.satList:
 						list.append(x)
@@ -939,7 +940,7 @@ def InitNimManager(nimmgr):
 
 	lnb_choices = {
 		"universal_lnb": _("Universal LNB"),
-		"unicable": _("Unicable"),
+#		"unicable": _("Unicable"),
 		"c_band": _("C-Band"),
 		"user_defined": _("User defined")}