# HG changeset patch # User rubidium # Date 2009-02-23 20:45:34 # Node ID 30baccfd77fb2180e5780fd7a14870602335bbe6 # Parent 8704b3fc2d79c10340bcf9dbaa4f10611bd753ca (svn r15561) -Fix [FS#2646]: segfault when saving a preset with unknown NewGRFs diff --git a/src/newgrf_gui.cpp b/src/newgrf_gui.cpp --- a/src/newgrf_gui.cpp +++ b/src/newgrf_gui.cpp @@ -394,18 +394,22 @@ struct NewGRFWindow : public Window { SetDParamStr(0, _grf_preset_list[this->preset]); this->widget[SNGRFS_PRESET_LIST].data = STR_JUST_RAW_STRING; } + this->SetWidgetDisabledState(SNGRFS_PRESET_DELETE, this->preset == -1); bool has_missing = false; + bool has_compatible = false; for (const GRFConfig *c = this->list; !has_missing && c != NULL; c = c->next) { - has_missing = c->status == GCS_NOT_FOUND || HasBit(c->flags, GCF_COMPATIBLE); + has_missing |= c->status == GCS_NOT_FOUND; + has_compatible |= HasBit(c->flags, GCF_COMPATIBLE); } - if (has_missing) { + if (has_missing || has_compatible) { this->widget[SNGRFS_CONTENT_DOWNLOAD].data = STR_CONTENT_INTRO_MISSING_BUTTON; this->widget[SNGRFS_CONTENT_DOWNLOAD].tooltips = STR_CONTENT_INTRO_MISSING_BUTTON_TIP; } else { this->widget[SNGRFS_CONTENT_DOWNLOAD].data = STR_CONTENT_INTRO_BUTTON; this->widget[SNGRFS_CONTENT_DOWNLOAD].tooltips = STR_CONTENT_INTRO_BUTTON_TIP; } + this->SetWidgetDisabledState(SNGRFS_PRESET_SAVE, has_missing); this->DrawWidgets();