From: Felix Domke <tmbinc@elitedvb.net>
Date: Mon, 1 May 2006 21:22:47 +0000 (+0000)
Subject: don't save None as service reference
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=55d519c26e9124873ca8be529066df184bd416f1

don't save None as service reference
---

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)