diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 8bfacb5d..71d4df20 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1267,6 +1267,7 @@ Reinhard Nissl for storing the original display size when handling DVB subtitles for reporting a problem with horizontal scaling of subtitles for fixing a buffer overflow in cFont::Bidi() + for avoiding an unecessary call to Recordings.ResetResume() Richard Robson for reporting freezing replay if a timer starts while in Transfer Mode from the diff --git a/HISTORY b/HISTORY index 9f6cd3e7..eaa914d1 100644 --- a/HISTORY +++ b/HISTORY @@ -6604,3 +6604,5 @@ Video Disk Recorder Revision History to Ville Skyttä). - The Makefile now also installs the include files (thanks to Ville Skyttä). - Added handling of "ANSI/SCTE 57" descriptors (thanks too Rolf Ahrenberg). +- Avoiding an unecessary call to Recordings.ResetResume() (thanks to Reinhard + Nissl). diff --git a/recording.c b/recording.c index 518325de..d4cf9c34 100644 --- a/recording.c +++ b/recording.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: recording.c 2.29 2011/04/17 13:20:46 kls Exp $ + * $Id: recording.c 2.30 2011/04/17 13:53:11 kls Exp $ */ #include "recording.h" @@ -303,9 +303,10 @@ bool cResumeFile::Save(int Index) void cResumeFile::Delete(void) { if (fileName) { - if (remove(fileName) < 0 && errno != ENOENT) + if (remove(fileName) == 0) + Recordings.ResetResume(fileName); + else if (errno != ENOENT) LOG_ERROR_STR(fileName); - Recordings.ResetResume(fileName); } }