X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3d054bf2cc5942ca6e15c8944b4d927d85903713..64bad81e89129d6f0c7276395509330ba952a887:/lib/python/Components/NimManager.py

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 53c6b62c..919bf587 100644
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -159,13 +159,6 @@ class NimManager:
 						break	
 		nimfile.close()
 		return self.nimType["empty/unknown"]
-		
-		if slotID == 0:
-			return self.nimType["DVB-S"]
-		elif slotID == 1:
-			return self.nimType["DVB-S"]
-		else:
-			return self.nimType["empty/unknown"]
 
 	def getNimName(self, slotID):
 		#FIXME get it from /proc
@@ -214,17 +207,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