X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/9bfa0ff587586c3bfe761200ca9fd890081024d4..54ef002317d169d6dafbe48735560676435ce53d:/lib/python/Screens/EpgSelection.py

diff --git a/lib/python/Screens/EpgSelection.py b/lib/python/Screens/EpgSelection.py
index c8db81b3..f9516e1d 100644
--- a/lib/python/Screens/EpgSelection.py
+++ b/lib/python/Screens/EpgSelection.py
@@ -46,11 +46,11 @@ class EPGSelection(Screen):
 			self.zapFunc = zapFunc
 
 		self["key_green"] = Button(_("Add timer"))
-		self["list"] = EPGList(self.type, self.onSelectionChanged)
+		self["list"] = EPGList(type = self.type, selChangedCB = self.onSelectionChanged, timer = self.session.nav.RecordTimer)
 
 		class ChannelActionMap(ActionMap):
 			def action(self, contexts, action):
-				ActionMap.action(self, contexts, action)
+				return ActionMap.action(self, contexts, action)
 
 		self["actions"] = ChannelActionMap(["EPGSelectActions", "OkCancelActions"],
 			{
@@ -67,7 +67,7 @@ class EPGSelection(Screen):
 		self.onLayoutFinish.append(self.onCreate)
 
 	def closeScreen(self):
-		self.close(self.closeRecursive or self.type == EPG_TYPE_SINGLE)
+		self.close(self.closeRecursive)
 
 	def infoKeyPressed(self):
 		if self.type == EPG_TYPE_MULTI:
@@ -105,8 +105,8 @@ class EPGSelection(Screen):
 			if self.type == EPG_TYPE_MULTI and cur[0] is None and cur[1].ref != old[1].ref:
 				self.eventViewCallback(setEvent, setService, val)
 			else:
-				setEvent(cur[0])
 				setService(cur[1])
+				setEvent(cur[0])
 
 	def zapTo(self): # just used in multiepg
 		if self.zapFunc != None:
@@ -155,25 +155,25 @@ class EPGSelection(Screen):
 
 	def applyButtonState(self, state):
 		if state == 1:
-			self["now_button_sel"].showWidget()
-			self["now_button"].hideWidget()
+			self["now_button_sel"].show()
+			self["now_button"].hide()
 		else:
-			self["now_button"].showWidget()
-			self["now_button_sel"].hideWidget()
+			self["now_button"].show()
+			self["now_button_sel"].hide()
 
 		if state == 2:
-			self["next_button_sel"].showWidget()
-			self["next_button"].hideWidget()
+			self["next_button_sel"].show()
+			self["next_button"].hide()
 		else:
-			self["next_button"].showWidget()
-			self["next_button_sel"].hideWidget()
+			self["next_button"].show()
+			self["next_button_sel"].hide()
 
 		if state == 3:
-			self["more_button_sel"].showWidget()
-			self["more_button"].hideWidget()
+			self["more_button_sel"].show()
+			self["more_button"].hide()
 		else:
-			self["more_button"].showWidget()
-			self["more_button_sel"].hideWidget()
+			self["more_button"].show()
+			self["more_button_sel"].hide()
 
 	def onSelectionChanged(self):
 		if self.type == EPG_TYPE_MULTI: