From 7040d61287d2e9f7b7bdd7a398fe0369a1459e0f Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Wed, 9 Sep 2015 19:44:42 +0100 Subject: [PATCH] House picker: Allow only one instance, remove button toggle behaviour. This makes it behave more like object picker window. --- src/terraform_gui.cpp | 7 ++----- src/town_gui.cpp | 3 +++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/terraform_gui.cpp b/src/terraform_gui.cpp index be774dc92a..b2b9e1ed10 100644 --- a/src/terraform_gui.cpp +++ b/src/terraform_gui.cpp @@ -613,11 +613,8 @@ struct ScenarioEditorLandscapeGenerationWindow : Window { ShowBuildObjectPicker(); break; - case WID_ETT_PLACE_HOUSE: // Place house button - if (HandlePlacePushButton(this, WID_ETT_PLACE_HOUSE, SPR_CURSOR_TOWN, HT_RECT)) { - ShowBuildHousePicker(this); - this->last_user_action = widget; - } + case WID_ETT_PLACE_HOUSE: // Place house button + ShowBuildHousePicker(this); break; case WID_ETT_INCREASE_SIZE: diff --git a/src/town_gui.cpp b/src/town_gui.cpp index 4ffae13bb2..2a3bcaf37c 100644 --- a/src/town_gui.cpp +++ b/src/town_gui.cpp @@ -1717,6 +1717,9 @@ static WindowDesc _house_picker_desc( */ void ShowBuildHousePicker(Window *parent) { + if (BringWindowToFrontById(WC_BUILD_HOUSE, 0) != NULL) { + return; + } new HousePickerWindow(&_house_picker_desc, parent); }