X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=ServiceReference.py;h=787c5c4aa0d58fd0d5a6649cb884fc3691688402;hb=2f71009743e6a1a516b82ac06c4a89ee4d6ea703;hp=238e7f6caf0972cb3de11f3e41ad22845a8a0863;hpb=bd8c0c0122a521030e867ec52aee69a48b8ab463;p=vuplus_dvbapp

diff --git a/ServiceReference.py b/ServiceReference.py
index 238e7f6..787c5c4 100644
--- a/ServiceReference.py
+++ b/ServiceReference.py
@@ -5,8 +5,8 @@ import NavigationInstance
 
 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()
@@ -16,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)