From 3ff1dc8555e0bf219e47ed002ea7b66a59bdaeb7 Mon Sep 17 00:00:00 2001
From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Sat, 12 Nov 2005 01:32:16 +0000
Subject: [PATCH] fix ScanSetup use ScanSetup for manual scan

---
 data/menu.xml                       |  4 +---
 lib/python/Components/NimManager.py | 22 ++++++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/data/menu.xml b/data/menu.xml
index 7fb76265..d566816b 100644
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -16,8 +16,6 @@
 		<!--<item text="Standby debug">quitMainloop()</item>
 		<item text="Networksetup">self.openSetup("network")</item>-->
 		<!--<item text="CI"><screen module="Ci" screen="CiSelection" /></item>-->
-		<item text="Scanconfiguration"><screen module="ScanSetup" screen="ScanSetup" /></item>
-		<item text="Timerentry"><screen module="TimerEntry" screen="TimerEntry" /></item>
 		<item text="Radio"><code>print "radio mode"</code></item>
 		<item text="Timer"><screen module="TimerEdit" screen="TimerEditList" /></item>
 		<item text="Information"><screen module="About" /></item>
@@ -32,7 +30,7 @@
 				<item text="Satelliteconfig"><screen module="Satconfig" screen="NimSelection" /></item>
 				<item text="Automatic Scan"><screen module="ScanSetup" screen="ScanSimple" /></item>
 				<!--<item text="Automatic Scan"><screen module="ServiceScan" /></item>-->
-				<item text="Manual Scan"><screen module="ServiceScan" /></item>
+				<item text="Manual Scan"><screen module="ScanSetup" /></item>
 				<item text="Rotor Control"></item>
 				<item text="Edit Transponder"></item>
 				<!--<item text="Satfinder"></item>-->
diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 53c6b62c..1ed6d03d 100644
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -214,17 +214,19 @@ class NimManager:
 		return list
 	
 	def getSatListForNim(self, slotid):
-		#print "slotid:", slotid
 		list = []
-		#print "self.satellites:", self.satList[config.Nims[slotid].diseqcA.value]
-		#print "diseqcA:", config.Nims[slotid].diseqcA.value
-		if (config.Nims[slotid].diseqcMode.value <= 3):
-			list.append(self.satList[config.Nims[slotid].diseqcA.value])
-		if (0 < config.Nims[slotid].diseqcMode.value <= 3):
-			list.append(self.satList[config.Nims[slotid].diseqcB.value])
-		if (config.Nims[slotid].diseqcMode.value == 3):
-			list.append(self.satList[config.Nims[slotid].diseqcC.value])
-			list.append(self.satList[config.Nims[slotid].diseqcD.value])
+		if (self.getNimType(slotid) != self.nimType["empty/unknown"]):
+			#print "slotid:", slotid
+			
+			#print "self.satellites:", self.satList[config.Nims[slotid].diseqcA.value]
+			#print "diseqcA:", config.Nims[slotid].diseqcA.value
+			if (config.Nims[slotid].diseqcMode.value <= 3):
+				list.append(self.satList[config.Nims[slotid].diseqcA.value])
+			if (0 < config.Nims[slotid].diseqcMode.value <= 3):
+				list.append(self.satList[config.Nims[slotid].diseqcB.value])
+			if (config.Nims[slotid].diseqcMode.value == 3):
+				list.append(self.satList[config.Nims[slotid].diseqcC.value])
+				list.append(self.satList[config.Nims[slotid].diseqcD.value])
 		return list
 
 	#callbacks for c++ config
-- 
2.30.2