From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Sat, 28 Jan 2006 16:54:41 +0000 (+0000)
Subject: fix no more working multi epg since previous BouquetSelector change
X-Git-Tag: 2.6.0~4228
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/5d4636e324a4fa38c1288e309dc4c72807ec01ab

fix no more working multi epg since previous BouquetSelector change
---

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 9535ef3c..9ca19121 100644
--- 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)