fix no more working multi epg since previous BouquetSelector change

[enigma2.git] / lib / python / Screens / ChannelSelection.py

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 9535ef3cadaf3ecac2613f1dabd24a7804ef1b5b..9ca191216af8db39aaf5b62c11d6045253c1d63a 100644 (file)
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -36,7 +36,6 @@ class BouquetSelector(Screen):
 
        def okbuttonClick(self):
                self.selectedFunc(self["menu"].getCurrent()[1])
-               self.close(True)
 
        def cancelClick(self):
                self.close(False)
@@ -107,12 +106,16 @@ class ChannelContextMenu(Screen):
                else:
                        cnt = len(bouquets)
                if cnt > 1: # show bouquet list
-                       self.session.openWithCallback(self.bouquetSelClosed, BouquetSelector, bouquets, self.addCurrentServiceToBouquet)
+                       self.session.openWithCallback(self.bouquetSelClosed, BouquetSelector, bouquets, self.bouquetSelected)
                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 bouquetSelected(self, bouquet):
+               self.addCurrentServiceToBouquet(bouquet)
+               self.close(True) # close bouquet selection
+
        def bouquetSelClosed(self, recursive):
                if recursive:
                        self.close(False)