X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/796d0c793ccbe5ecd6981d73b644f6aa4063b263..5e9af99815e94c739e4b13b04f4af74e77074d96:/lib/python/Screens/InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 4f0e76b1..9b6712e5 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -299,16 +299,36 @@ class InfoBarChannelSelection:
 		self.session.execDialog(self.servicelist)
 
 	def zapUp(self):
-		if currentConfigSelectionElement(config.usage.quickzap_bouquet_change) == "yes":
-			if self.servicelist.inBouquet() and self.servicelist.atBegin():
-				self.servicelist.prevBouquet()
-		self.servicelist.moveUp()
+		if self.servicelist.inBouquet():
+			prev = self.servicelist.getCurrentSelection()
+			if prev:
+				prev = prev.toString()
+				while True:
+					if currentConfigSelectionElement(config.usage.quickzap_bouquet_change) == "yes":
+						if self.servicelist.atBegin():
+							self.servicelist.prevBouquet()
+					self.servicelist.moveUp()
+					cur = self.servicelist.getCurrentSelection()
+					if not cur or (not (cur.flags & 64)) or cur.toString() == prev:
+						break
+		else:
+			self.servicelist.moveUp()
 		self.servicelist.zap()
 		self.doShow()
 
 	def zapDown(self):
-		if currentConfigSelectionElement(config.usage.quickzap_bouquet_change) == "yes" and self.servicelist.inBouquet() and self.servicelist.atEnd():
-			self.servicelist.nextBouquet()
+		if self.servicelist.inBouquet():
+			prev = self.servicelist.getCurrentSelection()
+			if prev:
+				prev = prev.toString()
+				while True:
+					if currentConfigSelectionElement(config.usage.quickzap_bouquet_change) == "yes" and self.servicelist.atEnd():
+						self.servicelist.nextBouquet()
+					else:
+						self.servicelist.moveDown()
+					cur = self.servicelist.getCurrentSelection()
+					if not cur or (not (cur.flags & 64)) or cur.toString() == prev:
+						break
 		else:
 			self.servicelist.moveDown()
 		self.servicelist.zap()