From 7775698bacf8053355be9c86fbab0eb5e244aa1a Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Tue, 25 May 2021 20:09:29 +0200 Subject: [PATCH] The error counter of a recording is now copied as is when editing a recording --- HISTORY | 3 ++- recording.c | 6 +----- vdr.5 | 4 +++- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/HISTORY b/HISTORY index 444c44ed..4424d479 100644 --- a/HISTORY +++ b/HISTORY @@ -9706,7 +9706,8 @@ Video Disk Recorder Revision History order to restore this functionality. However, it is recommended to use the function with the TimerActive parameter instead. -2021-05-23: +2021-05-25: - cRecordingInfo::Errors() now returns -1 for old recordings; added a missing 'const' (suggested by Christoph Haubrich). +- The error counter of a recording is now copied as is when editing a recording. diff --git a/recording.c b/recording.c index 574e0bdf..2cf1c888 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 5.8 2021/05/23 15:03:17 kls Exp $ + * $Id: recording.c 5.9 2021/05/25 20:09:29 kls Exp $ */ #include "recording.h" @@ -1206,10 +1206,6 @@ bool cRecording::WriteInfo(const char *OtherFileName) else info->SetErrors(0); } - else { - // This is an edited recording, so let's clear the error counter: - info->SetErrors(0); - } cSafeFile f(InfoFileName); if (f.Open()) { info->Write(f); diff --git a/vdr.5 b/vdr.5 index cb78944d..002f7d42 100644 --- a/vdr.5 +++ b/vdr.5 @@ -8,7 +8,7 @@ .\" License as specified in the file COPYING that comes with the .\" vdr distribution. .\" -.\" $Id: vdr.5 5.2 2021/05/19 11:22:20 kls Exp $ +.\" $Id: vdr.5 5.3 2021/05/25 20:09:29 kls Exp $ .\" .TH vdr 5 "15 Apr 2018" "2.4" "Video Disk Recorder Files" .SH NAME @@ -824,6 +824,8 @@ l l. The 'O' tag contains the number of errors that occurred during recording. If it is zero, the recording can be safely considered error free. The higher the value, the more damaged the recording is. +If this is an edited recording, the number of errors is that of the original +recording. .SS RESUME The file \fIresume\fR (if present in a recording directory) contains the position within the recording where the last replay session left off.