From 226fbe8eb2c31d925dcefa44420fbd03764ad34f Mon Sep 17 00:00:00 2001
From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Sat, 7 Oct 2006 15:58:04 +0000
Subject: [PATCH] subservice quickzap fixes

---
 lib/python/Screens/InfoBarGenerics.py     |  2 ++
 lib/python/Screens/SubservicesQuickzap.py | 23 +++++++++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 49d82477..4d4bd7aa 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -1453,6 +1453,7 @@ class InfoBarSubserviceSelection:
 				if newservice.valid():
 					del subservices
 					del service
+					self.doShow()
 					self.session.nav.playService(newservice)
 
 	def subserviceSelection(self):
@@ -1484,6 +1485,7 @@ class InfoBarSubserviceSelection:
 					self.session.open(SubservicesQuickzap, service[2])
 			else:
 				self["SubserviceQuickzapAction"].setEnabled(True)
+				self.doShow()
 				self.session.nav.playService(service[1])
 
 class InfoBarAdditionalInfo:
diff --git a/lib/python/Screens/SubservicesQuickzap.py b/lib/python/Screens/SubservicesQuickzap.py
index d7961079..07e35e36 100644
--- a/lib/python/Screens/SubservicesQuickzap.py
+++ b/lib/python/Screens/SubservicesQuickzap.py
@@ -56,18 +56,22 @@ class SubservicesQuickzap(InfoBarShowHide, InfoBarMenu, InfoBarServiceName, Info
 	
 	def nextSubservice(self):
 		self.updateSubservices()
-		if self.currentlyPlayingSubservice == self.n - 1:
-			self.playSubservice(0)
-		else:
-			self.playSubservice(self.currentlyPlayingSubservice + 1)
+		if self.n:
+			if self.currentlyPlayingSubservice >= self.n - 1:
+				self.playSubservice(0)
+			else:
+				self.playSubservice(self.currentlyPlayingSubservice + 1)
 	
 	def previousSubservice(self):
 		self.updateSubservices()
-		if self.currentlyPlayingSubservice == 0:
-			self.playSubservice(self.n - 1)
-		else:
-			self.playSubservice(self.currentlyPlayingSubservice - 1)
-	
+		if self.n:
+			if self.currentlyPlayingSubservice > self.n:
+				self.currentlyPlayingSubservice = self.n
+			if self.currentlyPlayingSubservice == 0:
+				self.playSubservice(self.n - 1)
+			else:
+				self.playSubservice(self.currentlyPlayingSubservice - 1)
+
 	def getSubserviceIndex(self, service):
 		self.updateSubservices()
 		for x in range(self.n):
@@ -109,7 +113,6 @@ class SubservicesQuickzap(InfoBarShowHide, InfoBarMenu, InfoBarServiceName, Info
 			self.close()
 		
 	def playSubservice(self, number = 0):
-		print "playSubservice"
 		newservice = self.subservices.getSubservice(number)
 		if newservice.valid():
 			del self.subservices
-- 
2.30.2