X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f4e9150aa736c1b7e7465a19da9355c3b8d56c6f..94f8049fca5c1522aef72334ab4f4697600618c0:/lib/python/Screens/ChannelSelection.py

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 7cdc0273..f4f91272 100644
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -67,11 +67,11 @@ class ChannelContextMenu(Screen):
 						menu.append((_("add service to favourites"), self.addServiceToBouquetSelected))
 				elif haveBouquets:
 					if not inBouquet and csel.getCurrentSelection().getPath().find("PROVIDERS") == -1:
-						menu.append((_("copy to favourites"), csel.copyCurrentToBouquetList))
+						menu.append((_("copy to favourites"), self.copyCurrentToBouquetList))
 				if inBouquet:
 					menu.append((_("remove service"), self.removeCurrentService))
 			elif haveBouquets:
-				menu.append((_("remove bouquet"), csel.removeBouquet))
+				menu.append((_("remove bouquet"), self.removeBouquet))
 
 		if inBouquet: # current list is editable?
 			if not csel.bouquet_mark_edit:
@@ -187,13 +187,16 @@ class ChannelSelectionEdit:
 			def __init__(self, csel, contexts = [ ], actions = { }, prio=0):
 				ActionMap.__init__(self, contexts, actions, prio)
 				self.csel = csel
+
 			def action(self, contexts, action):
 				if action == "cancel":
 					self.csel.handleEditCancel()
+					return 0 # fall-trough
 				elif action == "ok":
-					pass # avoid typo warning...
+					return 0 # fall-trough
 				else:
-					ActionMap.action(self, contexts, action)
+					return ActionMap.action(self, contexts, action)
+
 		self["ChannelSelectEditActions"] = ChannelSelectionEditActionMap(self, ["ChannelSelectEditActions", "OkCancelActions"],
 			{
 				"contextMenu": self.doContext,
@@ -434,6 +437,8 @@ class ChannelSelectionBase(Screen):
 		self.servicePathTV = [ ]
 		self.servicePathRadio = [ ]
 		self.servicePath = None
+		
+		self.mode = MODE_TV
 
 		self.pathChangedDisabled = False