summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2011-04-17 13:58:29 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2011-04-17 13:58:29 +0200
commitc670c0645f6445eb3b8c65abc601a83c35228411 (patch)
tree6bb803f28c5491de05aa543de4c983201e9c5082
parent71dacdce961006a5282c30ece6b00e40b08f69ad (diff)
downloadvdr-c670c0645f6445eb3b8c65abc601a83c35228411.tar.gz
vdr-c670c0645f6445eb3b8c65abc601a83c35228411.tar.bz2
Avoiding an unecessary call to Recordings.ResetResume()
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY2
-rw-r--r--recording.c7
3 files changed, 7 insertions, 3 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 8bfacb5d..71d4df20 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1267,6 +1267,7 @@ Reinhard Nissl <rnissl@gmx.de>
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 <richard_robson@beeb.net>
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);
}
}