From e02d608bce5e4c4f484f7e9bd81e23637968d10c Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Thu, 16 Jan 2014 11:09:03 +0100
Subject: [PATCH] Fixed deleting the source recording after moving it to a
 different volume

---
 CONTRIBUTORS | 2 ++
 HISTORY      | 2 ++
 recording.c  | 5 +++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 693cb96e..e2182fc7 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2389,6 +2389,8 @@ Christoph Haubrich <christoph1.haubrich@arcor.de>
  display gets hidden
  for reporting a wrong type ('int' vs. 'eTimerEvent') in the declaration of
  cSkinDisplayMenu::SetItemEvent()
+ for reporting that the source recording was not deleted after moving it to a different
+ volume
 
 Pekka Mauno <pekka.mauno@iki.fi>
  for fixing cSchedule::GetFollowingEvent() in case there is currently no present
diff --git a/HISTORY b/HISTORY
index 64863fef..0b8a6c83 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8146,3 +8146,5 @@ Video Disk Recorder Revision History
 - Increased MIN_TS_PACKETS_FOR_FRAME_DETECTOR to 10 in order to be able to record
   channels that need more than 5 TS packets for detecting frame borders (reported by
   Eike Sauer).
+- Fixed deleting the source recording after moving it to a different volume (reported
+  by Christoph Haubrich).
diff --git a/recording.c b/recording.c
index af73563a..d57e3f58 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 3.11 2013/12/27 11:06:01 kls Exp $
+ * $Id: recording.c 3.12 2014/01/16 11:03:41 kls Exp $
  */
 
 #include "recording.h"
@@ -1879,7 +1879,8 @@ bool cRecordingsHandlerEntry::Active(bool &Error)
   // Clean up:
   if (CopierFinishedOk && (Usage() & ruMove) != 0) {
      cRecording Recording(FileNameSrc());
-     Recording.Delete();
+     if (Recording.Delete())
+        DeletedRecordings.AddByName(Recording.FileName());
      }
   Recordings.ChangeState();
   Recordings.TouchUpdate();