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

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 1dff777a..78e17bb7 100644
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -554,6 +554,13 @@ class NimManager:
 	def getSatDescription(self, pos):
 		return self.satellites[pos]
 
+	def sortFunc(self, x):
+		orbpos = x[0]
+		if orbpos > 1800:
+			return orbpos - 3600
+		else:
+			return orbpos + 1800
+
 	def readTransponders(self):
 		# read initial networks from file. we only read files which we are interested in,
 		# which means only these where a compatible tuner exists.
@@ -565,7 +572,7 @@ class NimManager:
 		if self.hasNimType("DVB-S"):
 			print "Reading satellites.xml"
 			db.readSatellites(self.satList, self.satellites, self.transponders)
-			self.satList.sort(key = lambda x: x[0]) # sort by orbpos
+			self.satList.sort(key = self.sortFunc) # sort by orbpos
 			#print "SATLIST", self.satList
 			#print "SATS", self.satellites
 			#print "TRANSPONDERS", self.transponders
@@ -800,15 +807,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(nim.diseqcA.getSat())
+						list.append(self.satList[nim.diseqcA.index-1])
 				if dm in ("toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"):
 					if nim.diseqcB.orbital_position != 3601:
-						list.append(nim.diseqcB.getSat())
+						list.append(self.satList[nim.diseqcB.index-1])
 				if dm == "diseqc_a_b_c_d":
 					if nim.diseqcC.orbital_position != 3601:
-						list.append(nim.diseqcC.getSat())
+						list.append(self.satList[nim.diseqcC.index-1])
 					if nim.diseqcD.orbital_position != 3601:
-						list.append(nim.diseqcD.getSat())
+						list.append(self.satList[nim.diseqcD.index-1])
 				if dm == "positioner":
 					for x in self.satList:
 						list.append(x)
@@ -940,7 +947,7 @@ def InitNimManager(nimmgr):
 
 	lnb_choices = {
 		"universal_lnb": _("Universal LNB"),
-#		"unicable": _("Unicable"),
+		"unicable": _("Unicable"),
 		"c_band": _("C-Band"),
 		"user_defined": _("User defined")}