small optimizations and cleanups by Moritz Venn

[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..210c1aab3c225543c175d20330a1627d3423a438 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)
@@ -45,5 +47,5 @@ class ServiceName(Converter, object):
        text = property(getText)
 
        def changed(self, what):
-               if what[0] != self.CHANGED_SPECIFIC or what[1] in [iPlayableService.evStart]:
+               if what[0] != self.CHANGED_SPECIFIC or what[1] in (iPlayableService.evStart,):
                        Converter.changed(self, what)