From b6ac5a3ab9d2dcb9496ad16973bca14ec495fa31 Mon Sep 17 00:00:00 2001
From: Patric Stout <truebrain@openttd.org>
Date: Fri, 8 Jan 2021 23:28:46 +0100
Subject: Fix 85a49a0d3: hotkeys were enabled outside of GM_NORMAL (#8534)

---
 src/airport_gui.cpp | 1 +
 src/rail_gui.cpp    | 1 +
 2 files changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/airport_gui.cpp b/src/airport_gui.cpp
index e12b8dccb..0697c2443 100644
--- a/src/airport_gui.cpp
+++ b/src/airport_gui.cpp
@@ -172,6 +172,7 @@ struct BuildAirToolbarWindow : Window {
  */
 static EventState AirportToolbarGlobalHotkeys(int hotkey)
 {
+	if (_game_mode != GM_NORMAL) return ES_NOT_HANDLED;
 	Window *w = ShowBuildAirToolbar();
 	if (w == nullptr) return ES_NOT_HANDLED;
 	return w->OnHotkey(hotkey);
diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp
index 37c365881..77792f276 100644
--- a/src/rail_gui.cpp
+++ b/src/rail_gui.cpp
@@ -769,6 +769,7 @@ struct BuildRailToolbarWindow : Window {
  */
 static EventState RailToolbarGlobalHotkeys(int hotkey)
 {
+	if (_game_mode != GM_NORMAL) return ES_NOT_HANDLED;
 	extern RailType _last_built_railtype;
 	Window *w = ShowBuildRailToolbar(_last_built_railtype);
 	if (w == nullptr) return ES_NOT_HANDLED;
-- 
cgit v1.2.3-54-g00ecf