Fixed error handling in cCuttingThread::Action()

3 files changed, 6 insertions, 2 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index e7c84d43..48f424e5 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1548,6 +1548,7 @@ Udo Richter <udo_richter@gmx.de>
  for fixing a new[]/delete mismatch in cMenuEditStrItem::LeaveEditMode()
  for improving shutdown handling
  for making housekeeping wait for a while after a replay has ended
+ for fixing error handling in cCuttingThread::Action()
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
diff --git a/HISTORY b/HISTORY
index 70e40f0e..bafda406 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5544,3 +5544,4 @@ Video Disk Recorder Revision History
 - Fixed the "i18n:" target in the "newplugin" script, so that it can create the
   initial *.pot file.
 - Fixed handling the '-l' option.
+- Fixed error handling in cCuttingThread::Action() (thanks to Udo Richter).
diff --git a/cutter.c b/cutter.c
index b596f3f4..42f3ab37 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 1.17 2007/08/25 10:33:18 kls Exp $
+ * $Id: cutter.c 1.18 2008/01/13 12:22:21 kls Exp $
  */
 
 #include "cutter.h"
@@ -111,7 +111,9 @@ void cCuttingThread::Action(void)
                  }
               }
            else {
-              error = "index";
+              // Error, unless we're past the last cut-in and there's no cut-out
+              if (Mark || LastMark)
+                 error = "index";
               break;
               }