diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2009-06-21 14:08:51 +0200 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2009-06-21 14:08:51 +0200 |
| commit | c5910f79873651559f0e30a77419ddc30e044c0d (patch) | |
| tree | fd0711b49d9c9ef9060e9da49bc7d35efe686ed8 /timers.c | |
| parent | 8a85d7cd31c801673008282c7af4f683ddff51c2 (diff) | |
| download | vdr-c5910f79873651559f0e30a77419ddc30e044c0d.tar.gz vdr-c5910f79873651559f0e30a77419ddc30e044c0d.tar.bz2 | |
Fixed deleting expired timers if they have the VPS flag set, but the event they are assigned to doesn't have a VPS tag
Diffstat (limited to 'timers.c')
| -rw-r--r-- | timers.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: timers.c 2.1 2008/04/13 12:41:41 kls Exp $ + * $Id: timers.c 2.2 2009/06/21 14:06:33 kls Exp $ */ #include "timers.h" @@ -463,7 +463,7 @@ int cTimer::Matches(const cEvent *Event, int *Overlap) const bool cTimer::Expired(void) const { - return IsSingleEvent() && !Recording() && StopTime() + EXPIRELATENCY <= time(NULL) && (!HasFlags(tfVps) || !event); + return IsSingleEvent() && !Recording() && StopTime() + EXPIRELATENCY <= time(NULL) && (!HasFlags(tfVps) || !event || !event->Vps()); } time_t cTimer::StartTime(void) const |