From 35f76ce26bb58ca1fba0393643b887195e7d1404 Mon Sep 17 00:00:00 2001 From: rubidium Date: Fri, 2 Jan 2009 21:01:27 +0000 Subject: [PATCH] (svn r14787) -Fix: landscape toolbar getting closed when rail/road/water/airport toolbar gets closed with linked toolbars turned on. --- src/airport_gui.cpp | 2 +- src/dock_gui.cpp | 2 +- src/rail_gui.cpp | 2 +- src/road_gui.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/airport_gui.cpp b/src/airport_gui.cpp index e6c0a2e696..39e6004023 100644 --- a/src/airport_gui.cpp +++ b/src/airport_gui.cpp @@ -76,7 +76,7 @@ struct BuildAirToolbarWindow : Window { ~BuildAirToolbarWindow() { - if (_settings_client.gui.link_terraform_toolbar) DeleteWindowById(WC_SCEN_LAND_GEN, 0); + if (_settings_client.gui.link_terraform_toolbar) DeleteWindowById(WC_SCEN_LAND_GEN, 0, false); } virtual void OnPaint() diff --git a/src/dock_gui.cpp b/src/dock_gui.cpp index a9fc907094..943568af6d 100644 --- a/src/dock_gui.cpp +++ b/src/dock_gui.cpp @@ -169,7 +169,7 @@ struct BuildDocksToolbarWindow : Window { ~BuildDocksToolbarWindow() { - if (_settings_client.gui.link_terraform_toolbar) DeleteWindowById(WC_SCEN_LAND_GEN, 0); + if (_settings_client.gui.link_terraform_toolbar) DeleteWindowById(WC_SCEN_LAND_GEN, 0, false); } virtual void OnPaint() diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp index ac0416845f..713a0ab93f 100644 --- a/src/rail_gui.cpp +++ b/src/rail_gui.cpp @@ -626,7 +626,7 @@ struct BuildRailToolbarWindow : Window { ~BuildRailToolbarWindow() { - if (_settings_client.gui.link_terraform_toolbar) DeleteWindowById(WC_SCEN_LAND_GEN, 0); + if (_settings_client.gui.link_terraform_toolbar) DeleteWindowById(WC_SCEN_LAND_GEN, 0, false); } void UpdateRemoveWidgetStatus(int clicked_widget) diff --git a/src/road_gui.cpp b/src/road_gui.cpp index 254e5d03d6..938adc10fc 100644 --- a/src/road_gui.cpp +++ b/src/road_gui.cpp @@ -415,7 +415,7 @@ struct BuildRoadToolbarWindow : Window { ~BuildRoadToolbarWindow() { - if (_settings_client.gui.link_terraform_toolbar) DeleteWindowById(WC_SCEN_LAND_GEN, 0); + if (_settings_client.gui.link_terraform_toolbar) DeleteWindowById(WC_SCEN_LAND_GEN, 0, false); } /**