Fixed error handling in cCuttingThread::Action()

This commit is contained in:
Klaus Schmidinger 2008-01-13 12:23:39 +01:00
parent 2355fa852b
commit 29871d8585
3 changed files with 6 additions and 2 deletions

View File

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

View File

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

View File

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