X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b61a19dfbaeb8d614f8004a3e9af79737a850abc..2ec2a5e39a19d0de97fbe88b25ddfb4ded77f492:/ServiceReference.py

diff --git a/ServiceReference.py b/ServiceReference.py
index 150708d1..787c5c4a 100644
--- a/ServiceReference.py
+++ b/ServiceReference.py
@@ -5,9 +5,10 @@ import NavigationInstance
 
 class ServiceReference(eServiceReference):
 	def __init__(self, ref):
-		if isinstance(ref, str):
-			ref = eServiceReference(ref)
-		self.ref = ref
+		if not isinstance(ref, eServiceReference):
+			self.ref = eServiceReference(ref or "")
+		else:
+			self.ref = ref
 		self.serviceHandler = eServiceCenter.getInstance()
 
 	def __str__(self):
@@ -15,10 +16,7 @@ class ServiceReference(eServiceReference):
 	
 	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)
@@ -27,10 +25,10 @@ class ServiceReference(eServiceReference):
 		return self.serviceHandler.record(self.ref)
 	
 	def list(self):
-		return self.serviceHandler.list(self)
+		return self.serviceHandler.list(self.ref)
 	
 	def info(self):
-		return self.serviceHandler.info(self)
+		return self.serviceHandler.info(self.ref)
 
 	def offlineOperations(self):
 		return self.serviceHandler.offlineOperations(self.ref)