Mercurial > hg > openttd
changeset 14347:a3c6860ea115 draft
(svn r18902) -Fix [FS#3559]: the default button for the advanced settings didn't work
author | rubidium <rubidium@openttd.org> |
---|---|
date | Sat, 23 Jan 2010 19:33:18 +0000 |
parents | a279cef76b51 |
children | 6b52aeb513c9 |
files | src/settings_gui.cpp |
diffstat | 1 files changed, 18 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -1643,7 +1643,7 @@ this->valuewindow_entry = pe; SetDParam(0, value); - ShowQueryString(STR_JUST_INT, STR_CONFIG_SETTING_QUERY_CAPTION, 10, 100, this, CS_NUMERAL, QSF_NONE); + ShowQueryString(STR_JUST_INT, STR_CONFIG_SETTING_QUERY_CAPTION, 10, 100, this, CS_NUMERAL, QSF_ENABLE_DEFAULT); } } } @@ -1659,22 +1659,29 @@ virtual void OnQueryTextFinished(char *str) { + /* The user pressed cancel */ + if (str == NULL) return; + + assert(this->valuewindow_entry != NULL); + assert((this->valuewindow_entry->flags & SEF_KIND_MASK) == SEF_SETTING_KIND); + const SettingDesc *sd = this->valuewindow_entry->d.entry.setting; + + int32 value; if (!StrEmpty(str)) { - assert(this->valuewindow_entry != NULL); - assert((this->valuewindow_entry->flags & SEF_KIND_MASK) == SEF_SETTING_KIND); - const SettingDesc *sd = this->valuewindow_entry->d.entry.setting; - int32 value = atoi(str); + value = atoi(str); /* Save the correct currency-translated value */ if (sd->desc.flags & SGF_CURRENCY) value /= _currency->rate; + } else { + value = (int32)sd->desc.def; + } - if ((sd->desc.flags & SGF_PER_COMPANY) != 0) { - SetCompanySetting(this->valuewindow_entry->d.entry.index, value); - } else { - SetSettingValue(this->valuewindow_entry->d.entry.index, value); - } - this->SetDirty(); + if ((sd->desc.flags & SGF_PER_COMPANY) != 0) { + SetCompanySetting(this->valuewindow_entry->d.entry.index, value); + } else { + SetSettingValue(this->valuewindow_entry->d.entry.index, value); } + this->SetDirty(); } virtual void OnResize()