Mercurial > hg > openttd

changeset 19257:bd7677f21412 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r24146) -Fix [FS#5153]: Use default value when reading an invalid setting value. (Eddi)
author michi_cc <michi_cc@openttd.org>
date Tue, 17 Apr 2012 19:45:04 +0000
parents 108c54820682
children 9b54078e743f
files src/settings.cpp
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -364,7 +364,7 @@
 			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 @@
 			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 @@
 			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;