diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 497def03..4c5eada5 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -791,6 +791,7 @@ Sascha Volkenandt for reporting a bug in timeout handling in cRwLock::Lock() for pointing out that the SVDRP command DELR deleted recordings that are currently being written to by a timer + for fixing a crash in cConfig::Load() when compiling on the PPC Malcolm Caldwell for modifying LOF handling to allow for C-band reception diff --git a/HISTORY b/HISTORY index b29c442b..d1693956 100644 --- a/HISTORY +++ b/HISTORY @@ -3860,3 +3860,5 @@ Video Disk Recorder Revision History from a subfolder. - Fixed handling the '.update' file in case the video directory is not at the default location (reported by Jon Burgess). +- Fixed a crash in cConfig::Load() when compiling on the PPC (thanks to Sascha + Volkenandt). diff --git a/config.h b/config.h index 47595f5c..d33de6ad 100644 --- a/config.h +++ b/config.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.h 1.229 2005/09/26 21:40:16 kls Exp $ + * $Id: config.h 1.230 2005/10/01 10:41:33 kls Exp $ */ #ifndef __CONFIG_H @@ -91,7 +91,7 @@ public: const char *FileName(void) { return fileName; } bool Load(const char *FileName = NULL, bool AllowComments = false, bool MustExist = false) { - Clear(); + cConfig::Clear(); if (FileName) { free(fileName); fileName = strdup(FileName);