cpp/openttd-patchpack/source Changeset - r19336:02911140bea0

Changeset - r19336:02911140bea0

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

frosch - 12 years ago 2012-05-14 20:53:39
frosch@openttd.org

(svn r24247) -Fix: If loading of int-list settings fails, use the default.

1 file changed with 5 insertions and 1 deletions:

src/settings.cpp

0 comments (0 inline, 0 general)

src/settings.cpp

➞

Show inline comments

@@ @@ -507,7 +507,8 @@ static void IniLoadSettings(IniFile *ini @@
 			case SDT_NUMX:
 			case SDT_ONEOFMANY:
 			case SDT_MANYOFMANY:
 				Write_ValidateSetting(ptr, sd, (int32)(size_t)p); break;
 				Write_ValidateSetting(ptr, sd, (int32)(size_t)p);
 				break;
 			case SDT_STRING:
 				switch (GetVarMemType(sld->conv)) {
@@ @@ -532,6 +533,9 @@ static void IniLoadSettings(IniFile *ini @@
 				if (!LoadIntList((const char*)p, ptr, sld->length, GetVarMemType(sld->conv))) {
 					SetDParamStr(0, sdb->name);
 					ShowErrorMessage(STR_CONFIG_ERROR, STR_CONFIG_ERROR_ARRAY, WL_CRITICAL);
 					/* Use default */
 					LoadIntList((const char*)sdb->def, ptr, sld->length, GetVarMemType(sld->conv));
 				} else if (sd->desc.proc_cnvt != NULL) {
 					sd->desc.proc_cnvt((const char*)p);
+				}

0 comments (0 inline, 0 general)