X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/bf5a085bb50970bb6d1e4e6b4a8b4dbce33a7ba3..b5682256605acc192f4dddea11b0595344348bcb:/lib/python/Screens/SubservicesQuickzap.py

diff --git a/lib/python/Screens/SubservicesQuickzap.py b/lib/python/Screens/SubservicesQuickzap.py
index fcedc64f..c0988868 100644
--- a/lib/python/Screens/SubservicesQuickzap.py
+++ b/lib/python/Screens/SubservicesQuickzap.py
@@ -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)