summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY1
-rw-r--r--vdr.c5
2 files changed, 4 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index f27afa2f..58090998 100644
--- a/HISTORY
+++ b/HISTORY
@@ -794,3 +794,4 @@ Video Disk Recorder Revision History
- The new setup parameter SplitEditedFiles can be used to control whether or
not the result of an editing process shall be written into separate files.
- Fixed handling repeat function when using LIRC (thanks to Matthias Weingart).
+- Fixed the "system time seen..." message in case of overlapping timers.
diff --git a/vdr.c b/vdr.c
index d7c3f06e..d8fd1c6a 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
*
* The project's page is at http://www.cadsoft.de/people/kls/vdr
*
- * $Id: vdr.c 1.79 2001/09/23 14:33:39 kls Exp $
+ * $Id: vdr.c 1.80 2001/09/30 11:42:58 kls Exp $
*/
#define _GNU_SOURCE
@@ -355,7 +355,8 @@ int main(int argc, char *argv[])
cRecordControls::Process(Now);
cTimer *Timer = Timers.GetMatch(Now);
if (Timer) {
- dsyslog(LOG_INFO, "system time seen is %s", ctime(&Now));
+ if (!Timer->pending)
+ dsyslog(LOG_INFO, "system time seen is %s", ctime(&Now));
if (!cRecordControls::Start(Timer))
Timer->SetPending(true);
}