frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed deleting expired VPS timers

Browse Source
This commit is contained in:
Klaus Schmidinger 2006-09-15 15:01:40 +02:00
parent 1b79274fae
commit fd4ffed37b
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HISTORY
View File

@ -4915,9 +4915,11 @@ Video Disk Recorder Revision History
- Implemented a copy constructor for cTimer (thanks to Udo Richter for reporting that - Implemented a copy constructor for cTimer (thanks to Udo Richter for reporting that
an assignment in svdrp.c didn't use the cTimer::operator=()). an assignment in svdrp.c didn't use the cTimer::operator=()).
2006-09-09: Version 1.4.2-3 2006-09-15: Version 1.4.2-3
- Added --remove-destination to the 'cp' command for binaries in the Makefiles of - Added --remove-destination to the 'cp' command for binaries in the Makefiles of
the plugins (thanks to Rolf Ahrenberg). the plugins (thanks to Rolf Ahrenberg).
- The 'skincurses' plugin now adjusts the size of the OSD to the size of the console - The 'skincurses' plugin now adjusts the size of the OSD to the size of the console
window. window.
- Fixed deleting expired VPS timers (under certain conditions a timer could have been
deleted before it even started recording).

10
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 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" #include "timers.h"
@ -438,13 +438,7 @@ int cTimer::Matches(const cEvent *Event, int *Overlap) const
bool cTimer::Expired(void) const bool cTimer::Expired(void) const
{ {
if (IsSingleEvent() && !Recording() && StopTime() + EXPIRELATENCY <= time(NULL)) { return IsSingleEvent() && !Recording() && StopTime() + EXPIRELATENCY <= time(NULL) && (!HasFlags(tfVps) || !event);
if (HasFlags(tfVps) && event && event->Vps())
return event->RunningStatus() == SI::RunningStatusNotRunning;
else
return true;
}
return false;
} }
time_t cTimer::StartTime(void) const time_t cTimer::StartTime(void) const