X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f5f70f0586875cf34ab93c7abd1cf7165badf399..525b031d2b8401750293fde4e334dfc8a5193517:/lib/python/Components/Converter/FrontendInfo.py

diff --git a/lib/python/Components/Converter/FrontendInfo.py b/lib/python/Components/Converter/FrontendInfo.py
index 160214a7..4043a1be 100644
--- a/lib/python/Components/Converter/FrontendInfo.py
+++ b/lib/python/Components/Converter/FrontendInfo.py
@@ -29,7 +29,7 @@ class FrontendInfo(Converter, object):
 
 	@cached
 	def getText(self):
-		assert self.type not in [self.LOCK, self.SLOT_NUMBER], "the text output of FrontendInfo cannot be used for lock info"
+		assert self.type not in (self.LOCK, self.SLOT_NUMBER), "the text output of FrontendInfo cannot be used for lock info"
 		percent = None
 		if self.type == self.BER: # as count
 			count = self.source.ber
@@ -54,11 +54,17 @@ class FrontendInfo(Converter, object):
 
 	@cached
 	def getBool(self):
-		assert self.type in [self.LOCK, self.BER], "the boolean output of FrontendInfo can only be used for lock or BER info"
+		assert self.type in (self.LOCK, self.BER), "the boolean output of FrontendInfo can only be used for lock or BER info"
 		if self.type == self.LOCK:
-			return self.source.lock
+			lock = self.source.lock
+			if lock is None:
+				lock = False
+			return lock
 		else:
-			return self.source.ber > 0
+			ber = self.source.ber
+			if ber is None:
+				ber = 0
+			return ber > 0
 
 	text = property(getText)
 
@@ -86,7 +92,8 @@ class FrontendInfo(Converter, object):
 				return 2
 			return -1
 		elif self.type == self.SLOT_NUMBER:
-			return self.source.slot_number or -1
+			num = self.source.slot_number
+			return num is None and -1 or num
 
 	range = 65536
 	value = property(getValue)