handle empty bouquets

diff --git a/lib/python/Components/EpgList.py b/lib/python/Components/EpgList.py
index 2494ca0808b30c30f11d9679dd0e3b58b1bae81e..fa60400fd3c34641e2374fe9a89d598058f4e262 100644 (file)
--- 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):
                return x and x[1]
 
        def moveToService(self,serviceref):

+               if not serviceref:
+                       return

                index = 0
                refstr = serviceref.toString()
                for x in self.list:
                index = 0
                refstr = serviceref.toString()
                for x in self.list:


@@ -306,6 +308,8 @@ class EPGList(HTMLComponent, GUIComponent):
                        index += 1
                        
        def moveToEventId(self, eventId):
                        index += 1
                        
        def moveToEventId(self, eventId):

+               if not eventId:
+                       return

                index = 0
                for x in self.list:
                        if x[1] == eventId:
                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 8cb2569bddc61129aba81f072092c7794484700e..9b5f62c632e85616666fb29a320f354575bf7ab2 100644 (file)
--- 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
 
        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):
 
        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 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 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:
                return self.services[self.current]
 
 class InfoBarEPG: