From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Fri, 14 Sep 2007 23:50:27 +0000 (+0000)
Subject: fix bsod when select a not available service in channel selection
X-Git-Tag: 2.6.0~1913
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/d65ce06bfed2444d9870630f095db401d78a096e?ds=sidebyside

fix bsod when select a not available service in channel selection
---

diff --git a/lib/python/Components/Converter/ServiceName.py b/lib/python/Components/Converter/ServiceName.py
index 97b81f60..18b1f2a5 100644
--- a/lib/python/Components/Converter/ServiceName.py
+++ b/lib/python/Components/Converter/ServiceName.py
@@ -35,7 +35,9 @@ class ServiceName(Converter, object):
 		if info is None:
 			return ""
 		if self.type == self.NAME:
-			name = ref and info.getName(ref) or info.getName()
+			name = ref and info.getName(ref)
+			if name is None:
+				name = info.getName()
 			return name.replace('\xc2\x86', '').replace('\xc2\x87', '')
 		elif self.type == self.PROVIDER:
 			return self.getServiceInfoValue(info, iServiceInformation.sProvider, ref)