mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
Fixed resetting the 'First day' timer parameter once the timer actually starts recording
This commit is contained in:
parent
ea6f46d5fb
commit
3985f8dd49
4
HISTORY
4
HISTORY
@ -1151,7 +1151,7 @@ Video Disk Recorder Revision History
|
||||
commands.conf starts with a digit in the range '1'...'9', followed by a blank.
|
||||
- Fixed a bug in switching back the replay mode display in time shift mode
|
||||
(thanks to Achim Lange for reporting this one).
|
||||
- Fixed a bug in the 'First day' timer parameter for timers that record over
|
||||
- Fixed a bug in the "First day" timer parameter for timers that record over
|
||||
midnight.
|
||||
- Added units to Setup parameters.
|
||||
- Changed time entry in the 'Jump' command during replay, so that it is filled
|
||||
@ -1177,3 +1177,5 @@ Video Disk Recorder Revision History
|
||||
Kerner, problem was initially reported by Michel Moster, but somehow I had
|
||||
misplaced his message...).
|
||||
- Added Spanish language texts (thanks to Ruben Nunez Francisco).
|
||||
- Fixed resetting the "First day" timer parameter once the timer actually starts
|
||||
recording.
|
||||
|
6
config.c
6
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.96 2002/04/01 11:54:05 kls Exp $
|
||||
* $Id: config.c 1.97 2002/04/06 09:58:36 kls Exp $
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
@ -606,14 +606,14 @@ bool cTimer::Matches(time_t t)
|
||||
if ((!firstday || a >= firstday) && t <= b) {
|
||||
startTime = a;
|
||||
stopTime = b;
|
||||
if (t >= firstday + SECSINDAY)
|
||||
firstday = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!startTime)
|
||||
startTime = firstday; // just to have something that's more than a week in the future
|
||||
else if (t > startTime || t > firstday + SECSINDAY + 3600) // +3600 in case of DST change
|
||||
firstday = 0;
|
||||
return active && startTime <= t && t < stopTime; // must stop *before* stopTime to allow adjacent timers
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user