summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2011-01-19 23:59:29 +0000
committerrubidium <rubidium@openttd.org>2011-01-19 23:59:29 +0000
commit89a135293a0bbab3e9b669e71b21f5f0aa0621d8 (patch)
tree0411579ee9bf5a7a9435a3453764f76368afa55a
parent6435a89c28f298bf35e901a441909a3f5c975dc6 (diff)
downloadopenttd-89a135293a0bbab3e9b669e71b21f5f0aa0621d8.tar.xz
(svn r21864) -Fix [FS#4430]: distant-join station would build at the wrong location when having persistent building turned on and selecting a "second" location for the station tile
-rw-r--r--src/station_gui.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/station_gui.cpp b/src/station_gui.cpp
index b3ac5e310..433ab12bb 100644
--- a/src/station_gui.cpp
+++ b/src/station_gui.cpp
@@ -1481,8 +1481,6 @@ static bool StationJoinerNeeded(CommandContainer cmd, TileArea ta)
* return true (i.e. just flash the old window) */
Window *selection_window = FindWindowById(WC_SELECT_STATION, 0);
if (selection_window != NULL) {
- if (!_ctrl_pressed) return true;
-
/* Abort current distant-join and start new one */
delete selection_window;
UpdateTileSelection();
@@ -1512,7 +1510,6 @@ void ShowSelectBaseStationIfNeeded(CommandContainer cmd, TileArea ta)
{
if (StationJoinerNeeded<T>(cmd, ta)) {
if (!_settings_client.gui.persistent_buildingtools) ResetObjectToPlace();
- if (BringWindowToFrontById(WC_SELECT_STATION, 0)) return;
new SelectStationWindow<T>(&_select_station_desc, cmd, ta);
} else {
DoCommandP(&cmd);