diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 56ee68dd..dced3ca0 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1459,6 +1459,7 @@ Udo Richter <udo_richter@gmx.de>
  for fixing deleting the last character of a string menu item in insert mode
  for reporting that the shutdown message "Recording in ... minutes, shut down anyway?"
  may have been given with a negative number of minutes
+ for fixing getting the next active timer when shutting down
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
diff --git a/HISTORY b/HISTORY
index 210bcb7a..ba2e38c5 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4856,3 +4856,4 @@ Video Disk Recorder Revision History
   "Min. event timeout" minutes (default is 30) in the future.
 - Avoiding shutdown message "Recording in ... minutes, shut down anyway?" with
   a negative number of minutes (reported by Udo Richter).
+- Fixed getting the next active timer when shutting down (thanks to Udo Richter).
diff --git a/timers.c b/timers.c
index 15fbdd8e..8bc0b324 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.61 2006/05/25 14:36:37 kls Exp $
+ * $Id: timers.c 1.62 2006/08/05 12:03:36 kls Exp $
  */
 
 #include "timers.h"
@@ -351,7 +351,7 @@ bool cTimer::Matches(time_t t, bool Directly, int Margin) const
          if (DayMatches(t0)) {
             time_t a = SetTime(t0, begin);
             time_t b = a + length;
-            if ((!day || a >= day) && t <= b) {
+            if ((!day || a >= day) && t < b) {
                startTime = a;
                stopTime = b;
                break;
@@ -647,6 +647,7 @@ cTimer *cTimers::GetNextActiveTimer(void)
 {
   cTimer *t0 = NULL;
   for (cTimer *ti = First(); ti; ti = Next(ti)) {
+      ti->Matches();
       if ((ti->HasFlags(tfActive)) && (!t0 || ti->StopTime() > time(NULL) && ti->Compare(*t0) < 0))
          t0 = ti;
       }