Merge branch 'master' of git.opendreambox.org:/git/enigma2

[enigma2.git] / lib / python / Components / Converter / ServiceName.py

diff --git a/lib/python/Components/Converter/ServiceName.py b/lib/python/Components/Converter/ServiceName.py
index 97b81f609c1a231b594e78bf17e49241dded38f7..18b1f2a592b015233b2041868e56552b9cb27c5c 100644 (file)
--- 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)