frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/vdr-projects/vdr.git synced 2025-12-26 23:06:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed expiring VPS timers in case the event has not yet startet after its announced end time

Browse Source
This commit is contained in:
Klaus Schmidinger
2025-07-09 14:49:59 +02:00
parent da92c80484
commit 7fed1720e3
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@@ -10138,7 +10138,7 @@ Video Disk Recorder Revision History
- Fixed an invalid lock sequence when pressing the Channel+/Channel- keys while in the - Fixed an invalid lock sequence when pressing the Channel+/Channel- keys while in the
"What's on..." menu in live view. "What's on..." menu in live view.
2025-07-08: 2025-07-09:
- Fixed cPoller::Poll() to allow negative timeout values again. - Fixed cPoller::Poll() to allow negative timeout values again.
- When regenerating the index of a recording, PID changes are now taken into account - 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. timers.h.
APIVERSNUM is now 30009. APIVERSNUM is now 30009.
- Fixed the stop time of repeating timers in case of DST change (thanks to Markus Ehrnsperger). - 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.

4
timers.c
View File

@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * 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" #include "timers.h"
@@ -779,7 +779,7 @@ eTimerMatch cTimer::Matches(const cEvent *Event, int *Overlap) const
bool cTimer::Expired(void) const bool cTimer::Expired(void) const
{ {
if (IsSingleEvent() && !Recording()) { if (IsSingleEvent() && !Recording() && (!event || event->RunningStatus() == SI::RunningStatusNotRunning)) {
time_t Now = time(NULL); time_t Now = time(NULL);
time_t ExpireTime = StopTimeEvent(); time_t ExpireTime = StopTimeEvent();
if (HasFlags(tfVps)) { if (HasFlags(tfVps)) {