From: Felix Domke <tmbinc@elitedvb.net>
Date: Sun, 22 Mar 2009 23:32:10 +0000 (+0100)
Subject: handle empty bouquets
X-Git-Tag: 2.6.0~365
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/0c7eeca673a4b1bda346b472badabcb67f8c2908?hp=--cc

handle empty bouquets
---

0c7eeca673a4b1bda346b472badabcb67f8c2908
diff --git a/lib/python/Components/EpgList.py b/lib/python/Components/EpgList.py
index 2494ca08..fa60400f 100644
--- a/lib/python/Components/EpgList.py
+++ b/lib/python/Components/EpgList.py
@@ -297,6 +297,8 @@ class EPGList(HTMLComponent, GUIComponent):
 		return x and x[1]
 
 	def moveToService(self,serviceref):
+		if not serviceref:
+			return
 		index = 0
 		refstr = serviceref.toString()
 		for x in self.list:
@@ -306,6 +308,8 @@ class EPGList(HTMLComponent, GUIComponent):
 			index += 1
 			
 	def moveToEventId(self, eventId):
+		if not eventId:
+			return
 		index = 0
 		for x in self.list:
 			if x[1] == eventId:
diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 8cb2569b..9b5f62c6 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -398,23 +398,32 @@ class SimpleServicelist:
 		self.current = 0
 
 	def selectService(self, service):
-		self.current = 0
-		while self.services[self.current].ref != service:
-			self.current += 1
+		if not self.length:
+			self.current = -1
+		else:
+			self.current = 0
+			while self.services[self.current].ref != service:
+				self.current += 1
 
 	def nextService(self):
+		if not self.length:
+			return
 		if self.current+1 < self.length:
 			self.current += 1
 		else:
 			self.current = 0
 
 	def prevService(self):
+		if not self.length:
+			return
 		if self.current-1 > -1:
 			self.current -= 1
 		else:
 			self.current = self.length - 1
 
 	def currentService(self):
+		if not self.length:
+			return None
 		return self.services[self.current]
 
 class InfoBarEPG: