3 files changed, 10 insertions, 4 deletions
diff --git a/lib/python/Components/EpgList.py b/lib/python/Components/EpgList.py
index f2003f56..d995bb6b 100644
--- a/lib/python/Components/EpgList.py
+++ b/lib/python/Components/EpgList.py
@@ -76,10 +76,15 @@ class EPGList(HTMLComponent, GUIComponent):
 			if SINGLE_CPP > 0:
 				evt = self.l.getCurrent()
 			else:
-				eventid = self.l.getCurrentSelection()[0]
-				evt = self.getEventFromId(self.service, eventid)
+				cur = self.l.getCurrentSelection()
+				if cur is None:
+					return cur
+				else:
+					evt = self.getEventFromId(self.service, cur[0])
 		else:
 			tmp = self.l.getCurrentSelection()
+			if tmp is None:
+				return ( None, None )
 			eventid = tmp[2]
 			service = ServiceReference(tmp[1])
 			event = self.getEventFromId(service, eventid)
diff --git a/lib/python/Screens/EpgSelection.py b/lib/python/Screens/EpgSelection.py
index 04f858b9..f9516e1d 100644
--- a/lib/python/Screens/EpgSelection.py
+++ b/lib/python/Screens/EpgSelection.py
@@ -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:
diff --git a/lib/python/Screens/EventView.py b/lib/python/Screens/EventView.py
index 498702e5..86947461 100644
--- a/lib/python/Screens/EventView.py
+++ b/lib/python/Screens/EventView.py
@@ -39,8 +39,8 @@ class EventViewBase:
 		self.onShown.append(self.onCreate)
 
 	def onCreate(self):
-		self.setEvent(self.event)
 		self.setService(self.currentService)
+		self.setEvent(self.event)
 
 	def prevEvent(self):
 		if self.cbFunc is not None:
@@ -62,6 +62,7 @@ class EventViewBase:
 			print "Timeredit aborted"
 
 	def setService(self, service):
+		
 		self.currentService=service
 		if self.isRecording:
 			self["channel"].setText(_("Recording"))