From 5a5fc72814c0a687d38b64c387f9bda642f8c4aa Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 1 Sep 2001 15:04:14 +0200
Subject: Stopping finished timer recordings before starting new ones

---
 config.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'config.c')

diff --git a/config.c b/config.c
index 4ae79d26..102bad16 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.61 2001/09/01 10:02:21 kls Exp $
+ * $Id: config.c 1.62 2001/09/01 15:04:14 kls Exp $
  */
 
 #include "config.h"
@@ -571,7 +571,7 @@ bool cTimer::Matches(time_t t)
             }
          }
       }
-  return active && startTime <= t && t <= stopTime;
+  return active && startTime <= t && t < stopTime; // must stop *before* stopTime to allow adjacent timers
 }
 
 time_t cTimer::StartTime(void)
@@ -762,9 +762,8 @@ cTimer *cTimers::GetTimer(cTimer *Timer)
   return NULL;
 }
 
-cTimer *cTimers::GetMatch(void)
+cTimer *cTimers::GetMatch(time_t t)
 {
-  time_t t = time(NULL); // all timers must be checked against the exact same time to correctly handle Priority!
   cTimer *t0 = NULL;
   cTimer *ti = First();
   while (ti) {
-- 
cgit v1.2.3