diff --git a/HISTORY b/HISTORY index 5b501e61..7d3c59c9 100644 --- a/HISTORY +++ b/HISTORY @@ -6144,3 +6144,5 @@ Video Disk Recorder Revision History buffer has been accepted by the device (reported by Udo Richter). - Changed the EIT filter setup to save a few handles on devices that do hardware filtering. +- Fixed deleting expired timers if they have the VPS flag set, but the event they + are assigned to doesn't have a VPS tag. diff --git a/timers.c b/timers.c index b963dee0..191c0312 100644 --- a/timers.c +++ b/timers.c @@ -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