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 deleting expired VPS timers

Browse Source
This commit is contained in:
Klaus Schmidinger
2006-09-15 15:01:40 +02:00
parent 1b79274fae
commit fd4ffed37b
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
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.64 2006/09/08 15:06:09 kls Exp $
* $Id: timers.c 1.65 2006/09/15 14:15:53 kls Exp $
*/
#include "timers.h"
@@ -438,13 +438,7 @@ int cTimer::Matches(const cEvent *Event, int *Overlap) const
bool cTimer::Expired(void) const
{
if (IsSingleEvent() && !Recording() && StopTime() + EXPIRELATENCY <= time(NULL)) {
if (HasFlags(tfVps) && event && event->Vps())
return event->RunningStatus() == SI::RunningStatusNotRunning;
else
return true;
}
return false;
return IsSingleEvent() && !Recording() && StopTime() + EXPIRELATENCY <= time(NULL) && (!HasFlags(tfVps) || !event);
}
time_t cTimer::StartTime(void) const