From 858937f861f43adfebb64529afaa657c1b0cea00 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 11 Jun 2005 14:30:26 +0200
Subject: [PATCH] Fixed handling timers with a day given as MTWTF--@6

---
 CONTRIBUTORS | 4 ++++
 HISTORY      | 5 ++++-
 timers.c     | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 50147899..a73fdc9e 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1375,3 +1375,7 @@ Georg Acher <acher@baycom.de>
  for avoiding unnecessary calls to getLength() in libsi/si.c, and avoiding the
  '& 0xff' in CRC32::crc32() of libsi/util.c
  for suggesting to reduce the priority of the section handler threads
+
+Henrik Niehaus <henrik.niehaus@gmx.de>
+ for reporting a problem with timers with a day given as MTWTF--@6, i.e. a repeating
+ timer with first day not as full date, but just day of month
diff --git a/HISTORY b/HISTORY
index 8489a417..ae7e4e6a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3578,7 +3578,7 @@ Video Disk Recorder Revision History
 - Added cThread::SetPriority() and using it in cSectionHandler::Action() to
   reduce the priority of the section handler threads (as suggested by Georg Acher).
 
-2005-06-05: Version 1.3.26
+2005-06-11: Version 1.3.26
 
 - Updated the Estonian OSD texts (thanks to Arthur Konovalov).
 - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
@@ -3595,3 +3595,6 @@ Video Disk Recorder Revision History
   (suggested by Jan Ekholm).
 - Fixed the call to Channels.Unlock() in cEITScanner::Process() (thanks to
   Reinhard Nissl).
+- Fixed handling timers with a day given as MTWTF--@6, i.e. a repeating timer with
+  first day not as full date, but just day of month (thanks to Henrik Niehaus for
+  reporting this one).
diff --git a/timers.c b/timers.c
index 9e31f604..b6307e06 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.31 2005/05/07 11:10:56 kls Exp $
+ * $Id: timers.c 1.32 2005/06/11 14:19:58 kls Exp $
  */
 
 #include "timers.h"
@@ -159,7 +159,7 @@ bool cTimer::ParseDay(const char *s, time_t &Day, int &WeekDays)
      else {
         // handle "day of month" for compatibility with older versions:
         char *tail = NULL;
-        int day = strtol(s, &tail, 10);
+        int day = strtol(d, &tail, 10);
         if (tail && *tail || day < 1 || day > 31)
            return false;
         time_t t = time(NULL);