X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7d7331ac43c18159a7ebeb652e0e7d971118a8f7..d4969fafffd49c4791f56141d57281a83007a29b:/lib/python/Components/Sources/EventInfo.py

diff --git a/lib/python/Components/Sources/EventInfo.py b/lib/python/Components/Sources/EventInfo.py
index 40269993..a4bc874f 100644
--- a/lib/python/Components/Sources/EventInfo.py
+++ b/lib/python/Components/Sources/EventInfo.py
@@ -1,8 +1,9 @@
 from Components.PerServiceDisplay import PerServiceBase
-from Tools.Event import Event
+from Components.Element import cached
 from enigma import iPlayableService
 from Source import Source
 
+
 class EventInfo(PerServiceBase, Source, object):
 	NOW = 0
 	NEXT = 1
@@ -11,16 +12,23 @@ class EventInfo(PerServiceBase, Source, object):
 		Source.__init__(self)
 		PerServiceBase.__init__(self, navcore, 
 			{ 
-				iPlayableService.evStart: self.changed,
-				iPlayableService.evUpdatedEventInfo: self.changed,
-				iPlayableService.evEnd: self.changed
-			})
+				iPlayableService.evStart: self.gotEvent,
+				iPlayableService.evUpdatedEventInfo: self.gotEvent,
+				iPlayableService.evEnd: self.gotEvent
+			}, with_event=True)
 		
 		self.now_or_next = now_or_next
-		
+
+	@cached
 	def getEvent(self):
 		service = self.navcore.getCurrentService()
 		info = service and service.info()
 		return info and info.getEvent(self.now_or_next)
 
 	event = property(getEvent)
+
+	def gotEvent(self, what):
+		if what in [iPlayableService.evStart, iPlayableService.evEnd]:
+			self.changed((self.CHANGED_CLEAR,))
+		else:
+			self.changed((self.CHANGED_ALL,))