frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/vdr-projects/vdr.git synced 2025-03-01 10:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed getting the next active timer when shutting down

Browse Source
This commit is contained in:
Klaus Schmidinger
2006-08-05 12:06:11 +02:00
parent 394865b3d9
commit c78a784fb2
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
timers.c
View File

@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: timers.c 1.61 2006/05/25 14:36:37 kls Exp $
* $Id: timers.c 1.62 2006/08/05 12:03:36 kls Exp $
*/
#include "timers.h"
@@ -351,7 +351,7 @@ bool cTimer::Matches(time_t t, bool Directly, int Margin) const
if (DayMatches(t0)) {
time_t a = SetTime(t0, begin);
time_t b = a + length;
if ((!day || a >= day) && t <= b) {
if ((!day || a >= day) && t < b) {
startTime = a;
stopTime = b;
break;
@@ -647,6 +647,7 @@ cTimer *cTimers::GetNextActiveTimer(void)
{
cTimer *t0 = NULL;
for (cTimer *ti = First(); ti; ti = Next(ti)) {
ti->Matches();
if ((ti->HasFlags(tfActive)) && (!t0 || ti->StopTime() > time(NULL) && ti->Compare(*t0) < 0))
t0 = ti;
}