Merge branch 'master' into experimental

Conflicts:
	lib/python/Components/config.py

2 files changed, 18 insertions, 5 deletions

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 70cde47c..c339947c 100644
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -799,15 +799,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)
diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 876e3a34..a1f3d2c3 100755
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -1184,12 +1184,25 @@ class ConfigSatlist(ConfigSelection):
 	def __init__(self, list, default = None):
 		if default is not None:
 			default = str(default)
-		ConfigSelection.__init__(self, choices = [(str(orbpos), desc) for (orbpos, desc, flags) in list], default = default)
+		list.sort(key = lambda x: int(x[0]))
+		self._satList = list
+		choices = [(str(orbpos), desc) for (orbpos, desc, flags) in list]
+		
+		ConfigSelection.__init__(self, choices = choices, default = default)
 
+	# use this function to get the orbital position, don't rely on .index
 	def getOrbitalPosition(self):
 		if self.value == "":
 			return None
 		return int(self.value)
+	
+	def getSatList(self):
+		return self._satList
+	
+	def getSat(self):
+		return self.satList[self.index]
+	
+	satList = property(getSatList)
 
 	orbital_position = property(getOrbitalPosition)