summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY4
-rw-r--r--config.h6
-rw-r--r--cutter.c6
3 files changed, 10 insertions, 6 deletions
diff --git a/HISTORY b/HISTORY
index b6877ffc..515cfe51 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7812,3 +7812,7 @@ Video Disk Recorder Revision History
by Stefan Braun).
- Fixed a crash in the LCARS skin's main menu in case there is no current channel
(reported by Dominique Dumont).
+
+2013-08-21: Version 2.0.3
+
+- Fixed asserting free disk space in the cutter.
diff --git a/config.h b/config.h
index d99e2d17..f646f792 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: config.h 2.76.1.2 2013/04/27 10:18:08 kls Exp $
+ * $Id: config.h 2.76.1.3 2013/08/21 13:44:59 kls Exp $
*/
#ifndef __CONFIG_H
@@ -22,8 +22,8 @@
// VDR's own version number:
-#define VDRVERSION "2.0.2"
-#define VDRVERSNUM 20002 // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION "2.0.3"
+#define VDRVERSNUM 20003 // Version * 10000 + Major * 100 + Minor
// The plugin API's version number:
diff --git a/cutter.c b/cutter.c
index 6e5e662e..32c4e315 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: cutter.c 2.25.1.1 2013/05/02 09:21:18 kls Exp $
+ * $Id: cutter.c 2.25.1.2 2013/08/21 13:43:46 kls Exp $
*/
#include "cutter.h"
@@ -556,6 +556,8 @@ bool cCuttingThread::ProcessSequence(int LastEndIndex, int BeginIndex, int EndIn
bool Independent;
int Length;
if (LoadFrame(Index, Buffer, Independent, Length)) {
+ // Make sure there is enough disk space:
+ AssertFreeDiskSpace(-1);
bool CutIn = !SeamlessBegin && Index == BeginIndex;
bool CutOut = !SeamlessEnd && Index == EndIndex - 1;
bool DeletedFrame = false;
@@ -608,8 +610,6 @@ void cCuttingThread::Action(void)
cCondWait::SleepMs(100);
continue;
}
- // Make sure there is enough disk space:
- AssertFreeDiskSpace(-1);
// Determine the actual begin and end marks, skipping any marks at the same position:
cMark *EndMark = fromMarks.GetNextEnd(BeginMark);
// Process the current sequence: