change to next/prev bouquet when quickzap is used on last/prev service in bouquet

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 3931263764a64003e790ae6a3d5f33494ec293b3..2f12d033bf50bb3c23650421b937c63338315a69 100644 (file)
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -287,13 +287,18 @@ class InfoBarChannelSelection:
                self.servicelist.moveDown()
                self.session.execDialog(self.servicelist)
 
-       def     zapUp(self):
+       def zapUp(self):
+               if self.servicelist.inBouquet() and self.servicelist.atBegin():
+                       self.servicelist.prevBouquet()
                self.servicelist.moveUp()
                self.servicelist.zap()
                self.doShow()
 
-       def     zapDown(self):
-               self.servicelist.moveDown()
+       def zapDown(self):
+               if self.servicelist.inBouquet() and self.servicelist.atEnd():
+                       self.servicelist.nextBouquet()
+               else:
+                       self.servicelist.moveDown()
                self.servicelist.zap()
                self.doShow()