summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2006-01-27 15:41:41 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2006-01-27 15:41:41 +0100
commit8ab2383e18139b8250ace271f4c73d75aae436a6 (patch)
treeb612f6ccf0e547c034ffdf74ddcbf83ee1b72a06
parentdd155f2aafcafabb856c983700285bb99bcfa720 (diff)
downloadvdr-8ab2383e18139b8250ace271f4c73d75aae436a6.tar.gz
vdr-8ab2383e18139b8250ace271f4c73d75aae436a6.tar.bz2
Fixed handling the tfRecording flag when reading timers
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY2
-rw-r--r--timers.c3
3 files changed, 5 insertions, 1 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 13b96bb2..d92bbf5f 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -883,6 +883,7 @@ Andreas Mair <Andreas.Mair@linogate.com>
for reporting a short display of the main menu if a plugin displays its own OSD and
is started through a user defined key macro
for reporting a problem with extremely long summary fields in timers
+ for reporting a bug in handling the tfRecording flag when reading timers
Olivier Jacques <jacquesolivier@hotmail.com>)
for translating OSD texts to the French language
diff --git a/HISTORY b/HISTORY
index 7d9d60c5..90c76c52 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4239,3 +4239,5 @@ Video Disk Recorder Revision History
- Updated the Danish OSD texts (thanks to Mogens Elneff).
- Fixed a missing ',' in the Greek OSD texts (thanks to Arthur Konovalov).
- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
+- Fixed handling the tfRecording flag when reading timers (bug reported by Andreas
+ Mair).
diff --git a/timers.c b/timers.c
index a168cc1d..e5fc8436 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.43 2006/01/15 13:31:11 kls Exp $
+ * $Id: timers.c 1.44 2006/01/27 15:35:17 kls Exp $
*/
#include "timers.h"
@@ -245,6 +245,7 @@ bool cTimer::Parse(const char *s)
}
bool result = false;
if (8 <= sscanf(s, "%u :%a[^:]:%a[^:]:%d :%d :%d :%d :%a[^:\n]:%a[^\n]", &flags, &channelbuffer, &daybuffer, &start, &stop, &priority, &lifetime, &filebuffer, &summary)) {
+ ClrFlags(tfRecording);
if (summary && !*skipspace(summary)) {
free(summary);
summary = NULL;