diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2006-09-15 15:01:40 +0200 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2006-09-15 15:01:40 +0200 |
| commit | fd4ffed37bea7e196e49350741276339f92d51ee (patch) | |
| tree | 2b43e6b660cdda09a79a3e908645479305bb3cb2 /timers.c | |
| parent | 1b79274fae752076ffa13d4f43a698fefb68b3c6 (diff) | |
| download | vdr-fd4ffed37bea7e196e49350741276339f92d51ee.tar.gz vdr-fd4ffed37bea7e196e49350741276339f92d51ee.tar.bz2 | |
Fixed deleting expired VPS timers
Diffstat (limited to 'timers.c')
| -rw-r--r-- | timers.c | 10 |
1 files changed, 2 insertions, 8 deletions
@@ -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 |