X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7f088b2e0ec5051c3b9b9a1942198f0be28f315b..cab018779de4f2f01e0fe651e71112754ebd0ef8:/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py

diff --git a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
index d6d967d2..74568855 100644
--- a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
@@ -158,10 +158,14 @@ class Satfinder(ScanSetup):
 		if satpos is not None:
 			if self.tuning_type.value == "manual_transponder":
 				returnvalue = (self.scan_sat.frequency.value, self.scan_sat.symbolrate.value, self.scan_sat.polarization.index, self.scan_sat.fec.index, self.scan_sat.inversion.index, satpos)
+				self.tune(returnvalue)
 			elif self.tuning_type.value == "predefined_transponder":
-				transponder = nimmanager.getTransponders(satpos)[self.tuning_transponder.index]
-				returnvalue = (int(transponder[1] / 1000), int(transponder[2] / 1000), transponder[3], transponder[4], 2, satpos)
-			self.tune(returnvalue)
+				tps = nimmanager.getTransponders(satpos)
+				l = len(tps)
+				if l > self.tuning_transponder.index:
+					transponder = nimmanager.getTransponders(satpos)[self.tuning_transponder.index]
+					returnvalue = (int(transponder[1] / 1000), int(transponder[2] / 1000), transponder[3], transponder[4], 2, satpos)
+					self.tune(returnvalue)
 
 	def createConfig(self, foo):
 		self.tuning_transponder = None
@@ -184,6 +188,7 @@ class Satfinder(ScanSetup):
 		if orb_pos is not None:
 			transponderlist = nimmanager.getTransponders(orb_pos)
 			list = []
+			default = None
 			for x in transponderlist:
 				if x[3] == 0:
 					pol = "H"
@@ -219,8 +224,11 @@ class Satfinder(ScanSetup):
 					fec = "FEC_None"
 				else:
 					fec = "FEC_Unknown"
-				list.append(str(x[1]) + "," + str(x[2]) + "," + pol + "," + fec)
-			self.tuning_transponder = ConfigSelection(choices = list)
+				e = str(x[1]) + "," + str(x[2]) + "," + pol + "," + fec
+				if default is None:
+					default = e
+				list.append(e)
+			self.tuning_transponder = ConfigSelection(choices = list, default = default)
 			self.tuning_transponder.addNotifier(self.retune, initial_call = False)
 
 	def keyGo(self):
@@ -246,7 +254,7 @@ class Satfinder(ScanSetup):
 			if transponder is not None:
 				self.tuner.tune(transponder)
 
-class NimSelection(Screen):
+class SatNimSelection(Screen):
 	skin = """
 		<screen position="140,165" size="400,100" title="select Slot">
 			<widget name="nimlist" position="20,10" size="360,75" />
@@ -283,7 +291,7 @@ def SatfinderMain(session, **kwargs):
 			if len(nimList) == 1:
 				session.open(Satfinder, nimList[0])
 			else:
-				session.open(NimSelection)
+				session.open(SatNimSelection)
 
 def SatfinderStart(menuid, **kwargs):
 	if menuid == "scan":