From 14dc8dd619b28d63d11cfd7411886e41b692b753 Mon Sep 17 00:00:00 2001 From: PeterN Date: Mon, 29 Apr 2019 19:09:11 +0100 Subject: [PATCH] Fix 81d335b: Don't check state of widget not present in scenario editor. (#7551) --- src/dock_gui.cpp | 4 ++-- src/road_gui.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dock_gui.cpp b/src/dock_gui.cpp index d74c6d2caf..e99d456765 100644 --- a/src/dock_gui.cpp +++ b/src/dock_gui.cpp @@ -105,7 +105,7 @@ struct BuildDocksToolbarWindow : Window { ~BuildDocksToolbarWindow() { - if (this->IsWidgetLowered(WID_DT_STATION)) SetViewportCatchmentStation(nullptr, true); + if (_game_mode != GM_EDITOR && this->IsWidgetLowered(WID_DT_STATION)) SetViewportCatchmentStation(nullptr, true); if (_settings_client.gui.link_terraform_toolbar) DeleteWindowById(WC_SCEN_LAND_GEN, 0, false); } @@ -249,7 +249,7 @@ struct BuildDocksToolbarWindow : Window { void OnPlaceObjectAbort() override { - if (this->IsWidgetLowered(WID_DT_STATION)) SetViewportCatchmentStation(nullptr, true); + if (_game_mode != GM_EDITOR && this->IsWidgetLowered(WID_DT_STATION)) SetViewportCatchmentStation(nullptr, true); this->RaiseButtons(); diff --git a/src/road_gui.cpp b/src/road_gui.cpp index 78f5377dae..ca3bd6d08b 100644 --- a/src/road_gui.cpp +++ b/src/road_gui.cpp @@ -327,7 +327,7 @@ struct BuildRoadToolbarWindow : Window { ~BuildRoadToolbarWindow() { - if (this->IsWidgetLowered(WID_ROT_BUS_STATION) || this->IsWidgetLowered(WID_ROT_TRUCK_STATION)) SetViewportCatchmentStation(nullptr, true); + if (_game_mode != GM_EDITOR && (this->IsWidgetLowered(WID_ROT_BUS_STATION) || this->IsWidgetLowered(WID_ROT_TRUCK_STATION))) SetViewportCatchmentStation(nullptr, true); if (_settings_client.gui.link_terraform_toolbar) DeleteWindowById(WC_SCEN_LAND_GEN, 0, false); } @@ -546,7 +546,7 @@ struct BuildRoadToolbarWindow : Window { void OnPlaceObjectAbort() override { - if (this->IsWidgetLowered(WID_ROT_BUS_STATION) || this->IsWidgetLowered(WID_ROT_TRUCK_STATION)) SetViewportCatchmentStation(nullptr, true); + if (_game_mode != GM_EDITOR && (this->IsWidgetLowered(WID_ROT_BUS_STATION) || this->IsWidgetLowered(WID_ROT_TRUCK_STATION))) SetViewportCatchmentStation(nullptr, true); this->RaiseButtons(); this->SetWidgetsDisabledState(true,