summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2005-10-01 10:43:01 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2005-10-01 10:43:01 +0200
commitf3c99e697fe0dc078f7ce77814bfc871954cd2e4 (patch)
tree7b561d5cb1e9260831da08efa7c87f690f3022e4
parent13f68c478736e2f9f97607847688781aae77c041 (diff)
downloadvdr-f3c99e697fe0dc078f7ce77814bfc871954cd2e4.tar.gz
vdr-f3c99e697fe0dc078f7ce77814bfc871954cd2e4.tar.bz2
Fixed a crash in cConfig::Load() when compiling on the PPC
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY2
-rw-r--r--config.h4
3 files changed, 5 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 497def03..4c5eada5 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -791,6 +791,7 @@ Sascha Volkenandt <sascha@akv-soft.de>
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 <malcolm.caldwell@ntu.edu.au>
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<T>::Clear();
if (FileName) {
free(fileName);
fileName = strdup(FileName);