Fix #7635: Game crash on exit scenario editor.

5 years ago · 1e5029563c
parent 48fd7b2792
commit 1e5029563c
2 changed files with 2 additions and 2 deletions
--- a/src/dock_gui.cpp
+++ b/src/dock_gui.cpp
@ -105,7 +105,7 @@ struct BuildDocksToolbarWindow : Window {

 	~BuildDocksToolbarWindow()
 	{
-		if (_game_mode != GM_EDITOR && this->IsWidgetLowered(WID_DT_STATION)) SetViewportCatchmentStation(nullptr, true);
+		if (_game_mode == GM_NORMAL && this->IsWidgetLowered(WID_DT_STATION)) SetViewportCatchmentStation(nullptr, true);
 		if (_settings_client.gui.link_terraform_toolbar) DeleteWindowById(WC_SCEN_LAND_GEN, 0, false);
 	}

--- a/src/road_gui.cpp
+++ b/src/road_gui.cpp
@ -293,7 +293,7 @@ struct BuildRoadToolbarWindow : Window {

 	~BuildRoadToolbarWindow()
 	{
-		if (_game_mode != GM_EDITOR && (this->IsWidgetLowered(WID_ROT_BUS_STATION) || this->IsWidgetLowered(WID_ROT_TRUCK_STATION))) SetViewportCatchmentStation(nullptr, true);
+		if (_game_mode == GM_NORMAL && (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);
 	}