diff options
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 1 | ||||
| -rw-r--r-- | cutter.c | 5 |
3 files changed, 5 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 0dc3ecf8..3772203b 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1922,6 +1922,7 @@ Ville Skyttä <ville.skytta@iki.fi> for fixing the Language header of the Serbian translation file for using pkg-config to get fribidi, freetype and fontconfig cflags and libs for making the Makefile also install the include files + for fixing a crash when deleting a recording while cutting it Steffen Beyer <cpunk@reactor.de> for fixing setting the colored button help after deleting a recording in case the next @@ -6769,3 +6769,4 @@ Video Disk Recorder Revision History which DVB-S devices are connected to the same sat cable and are therefore "bonded". This obsoletes the LNBSHARE patch. Users of the LNBSHARE patch will need to newly set up their sat devices with the above options. +- Fixed a crash when deleting a recording while cutting it (thanks to Ville Skyttä). @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: cutter.c 2.9 2011/10/09 16:09:58 kls Exp $ + * $Id: cutter.c 2.10 2011/12/04 12:55:53 kls Exp $ */ #include "cutter.h" @@ -100,7 +100,8 @@ void cCuttingThread::Action(void) if (fromIndex->Get(Index++, &FileNumber, &FileOffset, &Independent, &Length)) { if (FileNumber != CurrentFileNumber) { fromFile = fromFileName->SetOffset(FileNumber, FileOffset); - fromFile->SetReadAhead(MEGABYTE(20)); + if (fromFile) + fromFile->SetReadAhead(MEGABYTE(20)); CurrentFileNumber = FileNumber; } if (fromFile) { |