mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
Fixed a crash in cConfig::Load() when compiling on the PPC
This commit is contained in:
parent
13f68c4787
commit
f3c99e697f
@ -791,6 +791,7 @@ Sascha Volkenandt <sascha@akv-soft.de>
|
|||||||
for reporting a bug in timeout handling in cRwLock::Lock()
|
for reporting a bug in timeout handling in cRwLock::Lock()
|
||||||
for pointing out that the SVDRP command DELR deleted recordings that are currently
|
for pointing out that the SVDRP command DELR deleted recordings that are currently
|
||||||
being written to by a timer
|
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>
|
Malcolm Caldwell <malcolm.caldwell@ntu.edu.au>
|
||||||
for modifying LOF handling to allow for C-band reception
|
for modifying LOF handling to allow for C-band reception
|
||||||
|
2
HISTORY
2
HISTORY
@ -3860,3 +3860,5 @@ Video Disk Recorder Revision History
|
|||||||
from a subfolder.
|
from a subfolder.
|
||||||
- Fixed handling the '.update' file in case the video directory is not at the default
|
- Fixed handling the '.update' file in case the video directory is not at the default
|
||||||
location (reported by Jon Burgess).
|
location (reported by Jon Burgess).
|
||||||
|
- Fixed a crash in cConfig::Load() when compiling on the PPC (thanks to Sascha
|
||||||
|
Volkenandt).
|
||||||
|
4
config.h
4
config.h
@ -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: 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
|
#ifndef __CONFIG_H
|
||||||
@ -91,7 +91,7 @@ public:
|
|||||||
const char *FileName(void) { return fileName; }
|
const char *FileName(void) { return fileName; }
|
||||||
bool Load(const char *FileName = NULL, bool AllowComments = false, bool MustExist = false)
|
bool Load(const char *FileName = NULL, bool AllowComments = false, bool MustExist = false)
|
||||||
{
|
{
|
||||||
Clear();
|
cConfig<T>::Clear();
|
||||||
if (FileName) {
|
if (FileName) {
|
||||||
free(fileName);
|
free(fileName);
|
||||||
fileName = strdup(FileName);
|
fileName = strdup(FileName);
|
||||||
|
Loading…
Reference in New Issue
Block a user