frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed checking toFile in cCuttingThread::Action()

This commit is contained in:
Klaus Schmidinger 2006-01-27 13:47:08 +01:00
parent 2f9af1b549
commit 3c8faf1b8d
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

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

2
HISTORY
View File

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

6
cutter.c
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.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;
}