summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2013-08-21 13:22:19 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2013-08-21 13:22:19 +0200
commit7a359a958eb0b5848c6f1594e1e76197cad50fad (patch)
tree17de0abd2098818d43eb04024df6db0308d6a0fa
parentcd10b439d0465afa6bce38188a4e9d8a5e74d859 (diff)
downloadvdr-7a359a958eb0b5848c6f1594e1e76197cad50fad.tar.gz
vdr-7a359a958eb0b5848c6f1594e1e76197cad50fad.tar.bz2
Fixed asserting free disk space in the cutter
-rw-r--r--HISTORY1
-rw-r--r--cutter.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/HISTORY b/HISTORY
index 0cdc691d..85116b8b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7868,3 +7868,4 @@ Video Disk Recorder Revision History
dish has reached its target position. Parsing SI data is paused until the target
position has been reached.
- The LCARS skin now shows the source value of the current channel in its channel display.
+- Fixed asserting free disk space in the cutter.
diff --git a/cutter.c b/cutter.c
index c4f053cc..5d007c48 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 3.1 2013/05/02 09:09:21 kls Exp $
+ * $Id: cutter.c 3.2 2013/08/21 13:15:24 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: