Fixed deleting the source recording after moving it to a different volume

This commit is contained in:
Klaus Schmidinger 2014-01-16 11:09:03 +01:00
parent 7008aeaf22
commit e02d608bce
3 changed files with 7 additions and 2 deletions

View File

@ -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

View File

@ -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).

View File

@ -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();