X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/01abec53c6856c24666967ee51d25d09fc6b8863..baa6968ed152a4e78ba27e3e48364a6b62680db2:/lib/python/Screens/SubservicesQuickzap.py

diff --git a/lib/python/Screens/SubservicesQuickzap.py b/lib/python/Screens/SubservicesQuickzap.py
index 09f2e727..c0988868 100644
--- a/lib/python/Screens/SubservicesQuickzap.py
+++ b/lib/python/Screens/SubservicesQuickzap.py
@@ -44,7 +44,7 @@ class SubservicesQuickzap(InfoBarShowHide, InfoBarMenu, InfoBarServiceName, Info
 				"8": self.keyNumberGlobal,
 				"9": self.keyNumberGlobal,
 				"0": self.keyNumberGlobal
-			}, -1)
+			}, 0)
 
 	def onLayoutFinished(self):
 		self.timer.start(0,True)
@@ -74,24 +74,27 @@ class SubservicesQuickzap(InfoBarShowHide, InfoBarMenu, InfoBarServiceName, Info
 
 	def getSubserviceIndex(self, service):
 		self.updateSubservices()
+		if self.n is None:
+			return -1
 		for x in range(self.n):
 			if service == self.subservices.getSubservice(x):
-				return self.n
+				return x
 	
 	def keyNumberGlobal(self, number):
 		print number, "pressed"
 		self.updateSubservices()
 		if number == 0:
 			self.playSubservice(self.lastservice)
-		elif number <= self.n - 1:
+		elif self.n is not None and number <= self.n - 1:
 			self.playSubservice(number)
 	
 	def showSelection(self):
 		self.updateSubservices()
 		tlist = []
-		for x in range(self.n):
-			i = self.subservices.getSubservice(x)
-			tlist.append((i.getName(), x))
+		if self.n is not None:
+			for x in range(self.n):
+				i = self.subservices.getSubservice(x)
+				tlist.append((i.getName(), x))
 
 		keys = [ "", "1", "2", "3", "4", "5", "6", "7", "8", "9" ] + [""] * self.n
 		self.session.openWithCallback(self.subserviceSelected, ChoiceBox, title=_("Please select a subservice..."), list = tlist, selection = self.currentlyPlayingSubservice, keys = keys)
@@ -118,8 +121,7 @@ class SubservicesQuickzap(InfoBarShowHide, InfoBarMenu, InfoBarServiceName, Info
 			del self.subservices
 			del self.service
 			self.lastservice = self.currentlyPlayingSubservice
-			self.session.nav.stopService()
 			self.session.nav.playService(newservice)
 			self.currentlyPlayingSubservice = number
 			self.currentSubserviceNumberLabel.setText(str(number))
-			self.doShow()
\ No newline at end of file
+			self.doShow()