handle empty bouquets

1 files changed, 12 insertions, 3 deletions

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: