From 7fed1720e3e7c947d3f787b656d0c56ff6ab69bf Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Wed, 9 Jul 2025 14:49:59 +0200 Subject: [PATCH] Fixed expiring VPS timers in case the event has not yet startet after its announced end time --- HISTORY | 3 ++- timers.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/HISTORY b/HISTORY index a560c13f..93291b4e 100644 --- a/HISTORY +++ b/HISTORY @@ -10138,7 +10138,7 @@ Video Disk Recorder Revision History - Fixed an invalid lock sequence when pressing the Channel+/Channel- keys while in the "What's on..." menu in live view. -2025-07-08: +2025-07-09: - Fixed cPoller::Poll() to allow negative timeout values again. - When regenerating the index of a recording, PID changes are now taken into account @@ -10165,3 +10165,4 @@ Video Disk Recorder Revision History timers.h. APIVERSNUM is now 30009. - Fixed the stop time of repeating timers in case of DST change (thanks to Markus Ehrnsperger). +- Fixed expiring VPS timers in case the event has not yet startet after its announced end time. diff --git a/timers.c b/timers.c index b03ab36e..b9eb3e86 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 5.27 2025/07/08 14:23:44 kls Exp $ + * $Id: timers.c 5.28 2025/07/09 14:49:59 kls Exp $ */ #include "timers.h" @@ -779,7 +779,7 @@ eTimerMatch cTimer::Matches(const cEvent *Event, int *Overlap) const bool cTimer::Expired(void) const { - if (IsSingleEvent() && !Recording()) { + if (IsSingleEvent() && !Recording() && (!event || event->RunningStatus() == SI::RunningStatusNotRunning)) { time_t Now = time(NULL); time_t ExpireTime = StopTimeEvent(); if (HasFlags(tfVps)) {