X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b8b871a579e8f9fc52dbd53bb451fac212775867..29f60fdaf6f0ff1dd112c9e0e913ec734b304bf1:/lib/python/Screens/ScanSetup.py

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index b2a53ab0..f007f6f2 100644
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -112,12 +112,13 @@ def getInitialTerrestrialTransponderList(tlist, region):
 			# FIXME: we need to convert the other parameters...
 			
 				# convert terrestrial.xml bandwidth to our enum
-			if x[2] in [0, 1]:
-				bandwidth = [1, 0][x[2]]
-			else:
-				bandwidth = 3 # auto
-			
-			parm = buildTerTransponder(x[1], bandwidth = [1, 0][x[2]])
+			#if x[2] in [0, 1]:
+			#	bandwidth = [1, 0][x[2]]
+			#else:
+			#	bandwidth = 3 # auto
+			#
+			#parm = buildTerTransponder(x[1], bandwidth = [1, 0][x[2]])
+			parm = buildTerTransponder(x[1], inversion = x[9], bandwidth = x[2])
 			tlist.append(parm)
 
 
@@ -503,10 +504,10 @@ class ScanSimple(Screen):
 							print sat
 							getInitialTransponderList(tlist, sat[1])
 				elif nimmanager.getNimType(x[1].parent.configPath) == nimmanager.nimType["DVB-C"]:
-					ScanPossible = True
+					scanPossible = True
 					getInitialCableTransponderList(tlist, nimmanager.getCableDescription(slotid))
 				elif nimmanager.getNimType(x[1].parent.configPath) == nimmanager.nimType["DVB-T"]:
-					ScanPossible = True
+					scanPossible = True
 					getInitialTerrestrialTransponderList(tlist, nimmanager.getTerrestrialDescription(slotid))
 				if scanPossible:
 					scanList.append({"transponders": tlist, "feid": slotid, "flags": eComponentScan.scanNetworkSearch})
@@ -542,9 +543,13 @@ class ScanSimple(Screen):
 			sec = eDVBSatelliteEquipmentControl.getInstance()
 			if sec is not None:
 				exclusive_satellites = sec.get_exclusive_satellites(0,1)
-				if len(exclusive_satellites) == 0:
+				if len(exclusive_satellites) == 2:
 					return False
-			return True
+				idx = exclusive_satellites[0]+1
+				exclusive_nim_sats = exclusive_satellites[idx+1:idx+1+exclusive_satellites[idx]]
+				if len(exclusive_nim_sats):
+					return True
+		return False # two -C or two -T tuners
 
 	def __init__(self, session):
 		Screen.__init__(self, session)