aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Screens/ChannelSelection.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/python/Screens/ChannelSelection.py')
-rw-r--r--lib/python/Screens/ChannelSelection.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index dd20e1c9..adc68945 100644
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -261,7 +261,15 @@ class ChannelSelectionBase(Screen):
self.numericalTextInput = NumericalTextInput()
+ def appendDVBTypes(self, ref):
+ path = ref.getPath()
+ pos = path.find(' FROM BOUQUET')
+ if pos != -1:
+ return eServiceReference(self.service_types + path[pos:])
+ return ref
+
def getBouquetNumOffset(self, bouquet):
+ bouquet = self.appendDVBTypes(bouquet)
if self.bouquet_root.getPath().find('FROM BOUQUET "bouquets.') == -1: #FIXME HACK
return 0
offsetCount = 0
@@ -269,7 +277,7 @@ class ChannelSelectionBase(Screen):
bouquetlist = serviceHandler.list(self.bouquet_root)
if not bouquetlist is None:
while True:
- bouquetIterator = bouquetlist.getNext()
+ bouquetIterator = self.appendDVBTypes(bouquetlist.getNext())
if not bouquetIterator.valid() or bouquetIterator == bouquet: #end of list or bouquet found
break
if ((bouquetIterator.flags & eServiceReference.flagDirectory) != eServiceReference.flagDirectory):