aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Screens
diff options
context:
space:
mode:
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>2006-02-01 16:54:35 +0000
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>2006-02-01 16:54:35 +0000
commit1712f32b9727edf5dfa96ee787aed5d3fc6b6df3 (patch)
treea80a282dbb48cf83987a442e404cfeee9dcad96c /lib/python/Screens
parentfe478efd1c354b304a3b68aa8fbcc5e5a53e7833 (diff)
downloadenigma2-1712f32b9727edf5dfa96ee787aed5d3fc6b6df3.tar.gz
enigma2-1712f32b9727edf5dfa96ee787aed5d3fc6b6df3.zip
fix close handling in context menu
Diffstat (limited to 'lib/python/Screens')
-rw-r--r--lib/python/Screens/ChannelSelection.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 9ca19121..d11e878b 100644
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -106,16 +106,12 @@ class ChannelContextMenu(Screen):
else:
cnt = len(bouquets)
if cnt > 1: # show bouquet list
- self.session.openWithCallback(self.bouquetSelClosed, BouquetSelector, bouquets, self.bouquetSelected)
+ 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 bouquetSelected(self, bouquet):
- self.addCurrentServiceToBouquet(bouquet)
- self.close(True) # close bouquet selection
-
def bouquetSelClosed(self, recursive):
if recursive:
self.close(False)
@@ -130,6 +126,7 @@ class ChannelContextMenu(Screen):
def addCurrentServiceToBouquet(self, dest):
self.csel.addCurrentServiceToBouquet(dest)
+ self.close(True) # close bouquet selection
def removeCurrentService(self):
self.csel.removeCurrentService()