From 0f7b73016add926ed86131e553004c85e294218f Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Wed, 5 Dec 2012 11:12:33 +0100 Subject: [PATCH] Fixed creating the edited version directory if a relative file name is given in the call to 'vdr --edit' --- HISTORY | 3 +++ recording.c | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/HISTORY b/HISTORY index f06b796d..a393bf68 100644 --- a/HISTORY +++ b/HISTORY @@ -7390,3 +7390,6 @@ Video Disk Recorder Revision History - When regenerating the index of a recording, the frame rate stored in the info file is now automatically fixed if it differs from the value detected by the frame detector. +- Fixed creating the edited version directory if a relative file name is given in + the call to 'vdr --edit' (the '/video' part was stripped from the given file name + even if it wasn't there). diff --git a/recording.c b/recording.c index edb86c51..00f95ca6 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.76 2012/12/05 10:32:00 kls Exp $ + * $Id: recording.c 2.77 2012/12/05 11:08:47 kls Exp $ */ #include "recording.h" @@ -691,7 +691,8 @@ cRecording::cRecording(const char *FileName) FileName = fileName = strdup(FileName); if (*(fileName + strlen(fileName) - 1) == '/') *(fileName + strlen(fileName) - 1) = 0; - FileName += strlen(VideoDirectory) + 1; + if (strstr(FileName, VideoDirectory) == FileName) + FileName += strlen(VideoDirectory) + 1; const char *p = strrchr(FileName, '/'); name = NULL;