git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add makefile
[enigma2.git]
/
ServiceReference.py
diff --git
a/ServiceReference.py
b/ServiceReference.py
index 238e7f6caf0972cb3de11f3e41ad22845a8a0863..787c5c4aa0d58fd0d5a6649cb884fc3691688402 100644
(file)
--- a/
ServiceReference.py
+++ b/
ServiceReference.py
@@
-5,8
+5,8
@@
import NavigationInstance
class ServiceReference(eServiceReference):
def __init__(self, ref):
class ServiceReference(eServiceReference):
def __init__(self, ref):
- if
isinstance(ref, str
):
- self.ref = eServiceReference(ref)
+ if
not isinstance(ref, eServiceReference
):
+ self.ref = eServiceReference(ref
or ""
)
else:
self.ref = ref
self.serviceHandler = eServiceCenter.getInstance()
else:
self.ref = ref
self.serviceHandler = eServiceCenter.getInstance()
@@
-16,10
+16,7
@@
class ServiceReference(eServiceReference):
def getServiceName(self):
info = self.info()
def getServiceName(self):
info = self.info()
- if info is None:
- return None
-
- return info.getName(self.ref)
+ return info and info.getName(self.ref) or ""
def play(self):
return self.serviceHandler.info(self.ref)
def play(self):
return self.serviceHandler.info(self.ref)