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

diff --git a/lib/python/Screens/EpgSelection.py b/lib/python/Screens/EpgSelection.py
index 7f1b204c..f9516e1d 100644
--- a/lib/python/Screens/EpgSelection.py
+++ b/lib/python/Screens/EpgSelection.py
@@ -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: