X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2b557e7ef4b0518736c5162a501cd9bc743930b3..8c614fe20e16f69aaf38440d2d132c10e86f820c:/lib/python/Screens/InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index ed8149e4..2c18500a 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -210,9 +210,9 @@ class InfoBarNumberZap:
 				serviceIterator = servicelist.getNext()
 				if not serviceIterator.valid(): #check end of list
 					break
-				if serviceIterator.flags: #assume normal dvb service have no flags set
-					continue
-				num -= 1;
+				playable = not (serviceIterator.flags & (eServiceReference.isMarker|eServiceReference.isDirectory))
+				if playable:
+					num -= 1;
 			if not num: #found service with searched number ?
 				return serviceIterator, 0
 		return None, num
@@ -230,9 +230,8 @@ class InfoBarNumberZap:
 					bouquet = self.servicelist.appendDVBTypes(bouquetlist.getNext())
 					if not bouquet.valid(): #check end of list
 						break
-					if not (bouquet.flags & eServiceReference.isDirectory):
-						continue
-					service, number = self.searchNumberHelper(serviceHandler, number, bouquet)
+					if bouquet.flags & eServiceReference.isDirectory:
+						service, number = self.searchNumberHelper(serviceHandler, number, bouquet)
 		if not service is None:
 			if self.servicelist.getRoot() != bouquet: #already in correct bouquet?
 				self.servicelist.clearPath()