Fixed checking toFile in cCuttingThread::Action()

3 files changed, 6 insertions, 3 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 5b460ca9..c52781d9 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -269,6 +269,7 @@ Matjaz Thaler <matjaz.thaler@guest.arnes.si>
 Artur Skawina <skawina@geocities.com>
  for improving the font file generation in the Makefile
  for pointing out a problem with the ERR macro defined by ncurses.h
+ for a patch that contained a fix for checking toFile in cCuttingThread::Action()
 
 Werner Fink <werner@suse.de>
  for making I/O more robust by handling EINTR
diff --git a/HISTORY b/HISTORY
index 6b1e1a8f..0a2cdc06 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4232,3 +4232,5 @@ Video Disk Recorder Revision History
 
 - EPG events from epg.data or SVDRP's PUTE command now have their Title set to
   "No Title" if none was set.
+- Fixed checking toFile in cCuttingThread::Action() (found in a larger patch from
+  Artur Skawina).
diff --git a/cutter.c b/cutter.c
index f656bbdd..6d3a152d 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.11 2005/10/31 12:26:44 kls Exp $
+ * $Id: cutter.c 1.12 2006/01/27 13:45:00 kls Exp $
  */
 
 #include "cutter.h"
@@ -118,7 +118,7 @@ void cCuttingThread::Action(void)
                  break;
               if (FileSize > MEGABYTE(Setup.MaxVideoFileSize)) {
                  toFile = toFileName->NextFile();
-                 if (toFile < 0) {
+                 if (!toFile) {
                     error = "toFile 1";
                     break;
                     }
@@ -158,7 +158,7 @@ void cCuttingThread::Action(void)
                  cutIn = true;
                  if (Setup.SplitEditedFiles) {
                     toFile = toFileName->NextFile();
-                    if (toFile < 0) {
+                    if (!toFile) {
                        error = "toFile 2";
                        break;
                        }