X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FNimManager.py;fp=lib%2Fpython%2FComponents%2FNimManager.py;h=31e59a6f3990b4701d2a84e0c2dfd35bf254fd7a;hp=be28293fe4f9c6786ce797e159e76bbf1bc27e8b;hb=9ba0f498b41bd5df2f275b52684852b393c47a0e;hpb=99d8e8619ebecaf00818fd175d7097013b08d121

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index be28293..31e59a6 100755
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -500,11 +500,7 @@ class NIM(object):
 		self.i2c = i2c
 		self.frontend_id = frontend_id
 		self.__is_empty = is_empty
-
-	def isCompatible(self, what):
-		if not self.isSupported():
-			return False
-		compatible = {
+		self.compatible = {
 				None: (None,),
 				"DVB-S": ("DVB-S", None),
 				"DVB-C": ("DVB-C", None),
@@ -512,7 +508,19 @@ class NIM(object):
 				"DVB-S2": ("DVB-S", "DVB-S2", None),
 				"DVB-T2": ("DVB-T", "DVB-T2", None)
 			}
-		return what in compatible[self.type]
+
+	def isCompatible(self, what):
+		if not self.isSupported():
+			return False
+		return what in self.compatible[self.type]
+
+	def canBeCompatible(self, what):
+		if self.isCompatible(what):
+			return True
+		for type in self.getMultiTypeList().values():
+			if what in self.compatible[type]:
+				return True
+		return False
 	
 	def getType(self):
 		return self.type
@@ -764,11 +772,8 @@ class NimManager:
 
 	def hasNimType(self, chktype):
 		for slot in self.nim_slots:
-			if slot.isCompatible(chktype):
+			if slot.canBeCompatible(chktype):
 				return True
-			for type in slot.getMultiTypeList().values():
-				if chktype == type:
-					return True
 		return False
 	
 	def getNimType(self, slotid):