frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed a crash when deleting a recording while cutting it

Browse Source
This commit is contained in:
Klaus Schmidinger 2011-12-04 12:56:55 +01:00
parent 9eeecef612
commit ada6766c19
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -1922,6 +1922,7 @@ Ville Skytt
for fixing the Language header of the Serbian translation file for fixing the Language header of the Serbian translation file
for using pkg-config to get fribidi, freetype and fontconfig cflags and libs for using pkg-config to get fribidi, freetype and fontconfig cflags and libs
for making the Makefile also install the include files 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> Steffen Beyer <cpunk@reactor.de>
for fixing setting the colored button help after deleting a recording in case the next for fixing setting the colored button help after deleting a recording in case the next

1
HISTORY
View File

@ -6769,3 +6769,4 @@ Video Disk Recorder Revision History
which DVB-S devices are connected to the same sat cable and are therefore "bonded". 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 This obsoletes the LNBSHARE patch. Users of the LNBSHARE patch will need to newly
set up their sat devices with the above options. set up their sat devices with the above options.
- Fixed a crash when deleting a recording while cutting it (thanks to Ville Skyttä).

5
cutter.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * 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" #include "cutter.h"
@ -100,7 +100,8 @@ void cCuttingThread::Action(void)
if (fromIndex->Get(Index++, &FileNumber, &FileOffset, &Independent, &Length)) { if (fromIndex->Get(Index++, &FileNumber, &FileOffset, &Independent, &Length)) {
if (FileNumber != CurrentFileNumber) { if (FileNumber != CurrentFileNumber) {
fromFile = fromFileName->SetOffset(FileNumber, FileOffset); fromFile = fromFileName->SetOffset(FileNumber, FileOffset);
fromFile->SetReadAhead(MEGABYTE(20)); if (fromFile)
fromFile->SetReadAhead(MEGABYTE(20));
CurrentFileNumber = FileNumber; CurrentFileNumber = FileNumber;
} }
if (fromFile) { if (fromFile) {