X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/619983c4f596e3371c58c52dd725680846376484..1c5637e71a4565181064cc0e00dac36fb113bf08:/lib/python/Screens/ScanSetup.py

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index f6ef01cf..f9c25c70 100644
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -188,10 +188,10 @@ class ScanSetup(ConfigListScreen, Screen):
 			self.list.append(self.typeOfScanEntry)
 
 		if nimmanager.getNimType(self.scan_nims.index) == nimmanager.nimType["DVB-S"]:
-
 			if self.scan_type.value == "single_transponder":
-				self.systemEntry = getConfigListEntry(_('Transpondertype'), self.scan_sat.system)
-				self.list.append(self.systemEntry)
+				if nimmanager.getNimName(self.scan_nims.index).find("DVB-S2") != -1:
+					self.systemEntry = getConfigListEntry(_('Transpondertype'), self.scan_sat.system)
+					self.list.append(self.systemEntry)
 				self.list.append(getConfigListEntry(_('Satellite'), self.scan_satselection[self.scan_nims.index]))
 				self.list.append(getConfigListEntry(_('Frequency'), self.scan_sat.frequency))
 				self.list.append(getConfigListEntry(_('Inversion'), self.scan_sat.inversion))
@@ -396,7 +396,7 @@ class ScanSetup(ConfigListScreen, Screen):
 			for slot in nimmanager.nimslots:
 				if (nimmanager.getNimType(slot.slotid) == nimmanager.nimType["DVB-S"]):
 					print str(slot.slotid) + " : " + str(self.satList)
-					self.scan_satselection.append(getConfigSatlist(defaultSat["orbpos"],self.satList[slot.slotid]))
+					self.scan_satselection.append(getConfigSatlist(int(defaultSat["orbpos"]), self.satList[slot.slotid]))
 				else:
 					self.scan_satselection.append(None)
 
@@ -483,8 +483,7 @@ class ScanSetup(ConfigListScreen, Screen):
 			elif self.scan_type.value == "single_satellite":
 				sat = self.satList[self.scan_nims.index][self.scan_satselection[self.scan_nims.index].index]
 				getInitialTransponderList(tlist, sat[0])
-				if sat[2] & 1:
-					flags |= eComponentScan.scanNetworkSearch
+				flags |= eComponentScan.scanNetworkSearch
 				tmp = self.scan_clearallservices.value
 				if tmp == "yes":
 					flags |= eComponentScan.scanRemoveServices