mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
Fixed handling video directory updates in case the timestamp of the .update file is in the future
This commit is contained in:
parent
59b6005a0c
commit
2d29eb90fe
@ -1819,6 +1819,8 @@ Petri Hintukainen <Petri.Hintukainen@hut.fi>
|
||||
have been several reports that it causes more problems than it solves
|
||||
for suggesting to add --remove-destination to the 'cp' command for binaries in
|
||||
the Makefile to avoid a crash in case a new version is installed on a running system
|
||||
for fixing handling video directory updates in case the timestamp of the .update
|
||||
file is in the future
|
||||
|
||||
Marcel Schaeben <mts280@gmx.de>
|
||||
for his "Easy Input" patch
|
||||
|
4
HISTORY
4
HISTORY
@ -4915,7 +4915,7 @@ Video Disk Recorder Revision History
|
||||
- Implemented a copy constructor for cTimer (thanks to Udo Richter for reporting that
|
||||
an assignment in svdrp.c didn't use the cTimer::operator=()).
|
||||
|
||||
2006-09-15: Version 1.4.2-3
|
||||
2006-09-16: Version 1.4.2-3
|
||||
|
||||
- Added --remove-destination to the 'cp' command for binaries in the Makefiles of
|
||||
the plugins (thanks to Rolf Ahrenberg).
|
||||
@ -4924,3 +4924,5 @@ Video Disk Recorder Revision History
|
||||
- Fixed deleting expired VPS timers (under certain conditions a timer could have been
|
||||
deleted before it even started recording).
|
||||
- Updated the Hungarian language texts (thanks to Istvan Koenigsberger and Guido Josten).
|
||||
- Fixed handling video directory updates in case the timestamp of the .update file
|
||||
is in the future (thanks to Petri Hintukainen).
|
||||
|
@ -4,7 +4,7 @@
|
||||
* See the main source file 'vdr.c' for copyright information and
|
||||
* how to reach the author.
|
||||
*
|
||||
* $Id: recording.c 1.149 2006/07/30 10:23:46 kls Exp $
|
||||
* $Id: recording.c 1.150 2006/09/16 12:12:34 kls Exp $
|
||||
*/
|
||||
|
||||
#include "recording.h"
|
||||
@ -947,7 +947,10 @@ void cRecordings::TouchUpdate(void)
|
||||
|
||||
bool cRecordings::NeedsUpdate(void)
|
||||
{
|
||||
return lastUpdate < LastModifiedTime(UpdateFileName());
|
||||
time_t lastModified = LastModifiedTime(UpdateFileName());
|
||||
if (lastModified > time(NULL))
|
||||
return false; // somebody's clock isn't running correctly
|
||||
return lastUpdate < lastModified;
|
||||
}
|
||||
|
||||
bool cRecordings::Update(bool Wait)
|
||||
|
Loading…
Reference in New Issue
Block a user