From 9271d9f1d01d3f9df9987445f80929b595cb4926 Mon Sep 17 00:00:00 2001 From: Andreas Monzner Date: Wed, 22 Nov 2006 22:18:54 +0000 Subject: [PATCH] fix getBouquetList --- lib/python/Screens/ChannelSelection.py | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py index 14721d3d..d0c9e305 100644 --- a/lib/python/Screens/ChannelSelection.py +++ b/lib/python/Screens/ChannelSelection.py @@ -162,8 +162,6 @@ class ChannelContextMenu(Screen): self.bsel = self.session.openWithCallback(self.bouquetSelClosed, BouquetSelector, bouquets, self.addCurrentServiceToBouquet) elif cnt == 1: # add to only one existing bouquet self.addCurrentServiceToBouquet(bouquets[0][1]) - else: #no bouquets in root.. so assume only one favourite list is used - self.addCurrentServiceToBouquet(self.csel.bouquet_root) def bouquetSelClosed(self, recursive): self.bsel = None @@ -846,10 +844,9 @@ class ChannelSelectionBase(Screen): self.servicelist.setCurrent(service) def getBouquetList(self): + bouquets = [ ] + serviceHandler = eServiceCenter.getInstance() if config.usage.multibouquet.value: - serviceCount=0 - bouquets = [ ] - serviceHandler = eServiceCenter.getInstance() list = serviceHandler.list(self.bouquet_root) if not list is None: while True: @@ -860,13 +857,12 @@ class ChannelSelectionBase(Screen): info = serviceHandler.info(s) if not info is None: bouquets.append((info.getName(s), s)) - else: - serviceCount += 1 - if len(bouquets) == 0 and serviceCount > 0: - info = serviceHandler.info(self.bouquet_root) - if not info is None: - bouquets.append((info.getName(self.bouquet_root), self.bouquet_root)) return bouquets + else: + info = serviceHandler.info(self.bouquet_root) + if not info is None: + bouquets.append((info.getName(self.bouquet_root), self.bouquet_root)) + return bouquets return None def keyNumber0(self, num): -- 2.30.2