summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY4
-rw-r--r--config.c4
3 files changed, 6 insertions, 3 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 100788cc..67be87ca 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2740,6 +2740,7 @@ Johann Friedrichs <johann.friedrichs@web.de>
for making cPalette::ClosestColor() treat fully transparent colors as "equal"
for implementing scaling of SPU bitmaps
for fixing creating a new VPS timer with the SVDRP command NEWT
+ for fixing loading the setup.conf file in case a parameter contains the '#' character
Timo Helkio <timolavi@mbnet.fi>
for reporting a hangup when replaying a TS recording with subtitles activated
diff --git a/HISTORY b/HISTORY
index 44457e3a..0cf0c8cd 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7757,9 +7757,11 @@ Video Disk Recorder Revision History
- Fixed creating a new VPS timer with the SVDRP command NEWT (thanks to Johann
Friedrichs).
-2013-03-17: Version 1.7.42
+2013-03-18: Version 1.7.42
- Updated the Serbian OSD texts (thanks to Zoran Turalija).
- Added maximum SNR and signal strength value for TechniSat SkyStar HD2 (thanks to
Zoran Turalija).
- Renamed the language file sr_SR.po to sr_RS.po (pointed out by Zoran Turalija).
+- Fixed loading the setup.conf file in case a parameter contains the '#' character
+ (thanks to Johann Friedrichs).
diff --git a/config.c b/config.c
index 3dc9fe84..7a153cb1 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: config.c 2.37 2013/03/10 14:56:51 kls Exp $
+ * $Id: config.c 2.38 2013/03/18 08:57:50 kls Exp $
*/
#include "config.h"
@@ -518,7 +518,7 @@ void cSetup::Store(const char *Name, double &Value, const char *Plugin)
bool cSetup::Load(const char *FileName)
{
- if (cConfig<cSetupLine>::Load(FileName, true)) {
+ if (cConfig<cSetupLine>::Load(FileName)) {
bool result = true;
for (cSetupLine *l = First(); l; l = Next(l)) {
bool error = false;