(svn r15413) -Fix [FS#2529/2533]: inconsistencies between station and bridge building w.r.t. tile selection and when the window should be closed.

1 files changed, 1 insertions, 8 deletions

diff --git a/src/station_gui.cpp b/src/station_gui.cpp
index 675c7992d..c2a536ca0 100644
--- a/src/station_gui.cpp
+++ b/src/station_gui.cpp
@@ -1129,20 +1129,12 @@ struct SelectStationWindow : Window {
 	{
 		this->vscroll.cap = 6;
 		this->resize.step_height = 10;
-		_thd.lock_pos = true;
-		_thd.lock_size = true;
 
 		FindStationsNearby(this->tile, this->size_x, this->size_y, true);
 
 		this->FindWindowPlacementAndResize(desc);
 	}
 
-	~SelectStationWindow()
-	{
-		_thd.lock_pos = false;
-		_thd.lock_size = false;
-	}
-
 	virtual void OnPaint()
 	{
 		SetVScrollCount(this, _stations_nearby_list.Length() + 1);
@@ -1260,6 +1252,7 @@ static bool StationJoinerNeeded(CommandContainer cmd, int w, int h)
 void ShowSelectStationIfNeeded(CommandContainer cmd, int w, int h)
 {
 	if (StationJoinerNeeded(cmd, w, h)) {
+		if (!_settings_client.gui.persistent_buildingtools) ResetObjectToPlace();
 		if (BringWindowToFrontById(WC_SELECT_STATION, 0)) return;
 		new SelectStationWindow(&_select_station_desc, cmd, w, h);
 	} else {