From 3f267db3a6928873a7041f281a2fb5d2abbd423c Mon Sep 17 00:00:00 2001 From: michi_cc Date: Tue, 17 Apr 2012 19:45:04 +0000 Subject: (svn r24146) -Fix [FS#5153]: Use default value when reading an invalid setting value. (Eddi) --- src/settings.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/settings.cpp') diff --git a/src/settings.cpp b/src/settings.cpp index ff988ad9d..2b109e51e 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -364,7 +364,7 @@ static const void *StringToVal(const SettingDescBase *desc, const char *orig_str SetDParamStr(0, str); SetDParamStr(1, desc->name); ShowErrorMessage(STR_CONFIG_ERROR, STR_CONFIG_ERROR_INVALID_VALUE, WL_CRITICAL); - return 0; + return desc->def; } case SDT_MANYOFMANY: { @@ -373,7 +373,7 @@ static const void *StringToVal(const SettingDescBase *desc, const char *orig_str SetDParamStr(0, str); SetDParamStr(1, desc->name); ShowErrorMessage(STR_CONFIG_ERROR, STR_CONFIG_ERROR_INVALID_VALUE, WL_CRITICAL); - return NULL; + return desc->def; } case SDT_BOOLX: @@ -383,7 +383,7 @@ static const void *StringToVal(const SettingDescBase *desc, const char *orig_str SetDParamStr(0, str); SetDParamStr(1, desc->name); ShowErrorMessage(STR_CONFIG_ERROR, STR_CONFIG_ERROR_INVALID_VALUE, WL_CRITICAL); - break; + return desc->def; case SDT_STRING: return orig_str; case SDT_INTLIST: return str; -- cgit v1.2.3-54-g00ecf