2 files changed, 6 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index 63dff883..58837cf2 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4436,3 +4436,5 @@ Video Disk Recorder Revision History
   disk space (reported by Jan Lenz).
 - Fixed handling repeating VPS timers (they stopped recording too early).
 - Timer log messages now show "VPS" if this is a VPS timer.
+- Fixed getting the present EPG event in case none is currently 'running' (it
+  then returns the one that just ended).
diff --git a/epg.c b/epg.c
index 9b24da46..15a2b0b0 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.65 2006/02/28 13:56:05 kls Exp $
+ * $Id: epg.c 1.66 2006/03/25 11:43:00 kls Exp $
  */
 
 #include "epg.h"
@@ -677,8 +677,10 @@ const cEvent *cSchedule::GetPresentEvent(void) const
   const cEvent *pe = NULL;
   time_t now = time(NULL);
   for (cEvent *p = events.First(); p; p = events.Next(p)) {
-      if (p->StartTime() <= now && now < p->EndTime())
+      if (p->StartTime() <= now)
          pe = p;
+      else if (p->StartTime() > now + 3600)
+         break;
       if (p->SeenWithin(RUNNINGSTATUSTIMEOUT) && p->RunningStatus() >= SI::RunningStatusPausing)
          return p;
       }