mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r24146) -Fix [FS#5153]: Use default value when reading an invalid setting value. (Eddi)
This commit is contained in:
parent
6c8a16f36e
commit
3f267db3a6
|
@ -364,7 +364,7 @@ static const void *StringToVal(const SettingDescBase *desc, const char *orig_str
|
||||||
SetDParamStr(0, str);
|
SetDParamStr(0, str);
|
||||||
SetDParamStr(1, desc->name);
|
SetDParamStr(1, desc->name);
|
||||||
ShowErrorMessage(STR_CONFIG_ERROR, STR_CONFIG_ERROR_INVALID_VALUE, WL_CRITICAL);
|
ShowErrorMessage(STR_CONFIG_ERROR, STR_CONFIG_ERROR_INVALID_VALUE, WL_CRITICAL);
|
||||||
return 0;
|
return desc->def;
|
||||||
}
|
}
|
||||||
|
|
||||||
case SDT_MANYOFMANY: {
|
case SDT_MANYOFMANY: {
|
||||||
|
@ -373,7 +373,7 @@ static const void *StringToVal(const SettingDescBase *desc, const char *orig_str
|
||||||
SetDParamStr(0, str);
|
SetDParamStr(0, str);
|
||||||
SetDParamStr(1, desc->name);
|
SetDParamStr(1, desc->name);
|
||||||
ShowErrorMessage(STR_CONFIG_ERROR, STR_CONFIG_ERROR_INVALID_VALUE, WL_CRITICAL);
|
ShowErrorMessage(STR_CONFIG_ERROR, STR_CONFIG_ERROR_INVALID_VALUE, WL_CRITICAL);
|
||||||
return NULL;
|
return desc->def;
|
||||||
}
|
}
|
||||||
|
|
||||||
case SDT_BOOLX:
|
case SDT_BOOLX:
|
||||||
|
@ -383,7 +383,7 @@ static const void *StringToVal(const SettingDescBase *desc, const char *orig_str
|
||||||
SetDParamStr(0, str);
|
SetDParamStr(0, str);
|
||||||
SetDParamStr(1, desc->name);
|
SetDParamStr(1, desc->name);
|
||||||
ShowErrorMessage(STR_CONFIG_ERROR, STR_CONFIG_ERROR_INVALID_VALUE, WL_CRITICAL);
|
ShowErrorMessage(STR_CONFIG_ERROR, STR_CONFIG_ERROR_INVALID_VALUE, WL_CRITICAL);
|
||||||
break;
|
return desc->def;
|
||||||
|
|
||||||
case SDT_STRING: return orig_str;
|
case SDT_STRING: return orig_str;
|
||||||
case SDT_INTLIST: return str;
|
case SDT_INTLIST: return str;
|
||||||
|
|
Loading…
Reference in New Issue