dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix 85a49a0d3: hotkeys were enabled outside of GM_NORMAL (#8534)

Browse Source
This commit is contained in:
Patric Stout
2021-01-08 23:28:46 +01:00
committed by GitHub
parent 5f591c86fe
commit b6ac5a3ab9
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/airport_gui.cpp
View File

@@ -172,6 +172,7 @@ struct BuildAirToolbarWindow : Window {
*/ */
static EventState AirportToolbarGlobalHotkeys(int hotkey) static EventState AirportToolbarGlobalHotkeys(int hotkey)
{ {
if (_game_mode != GM_NORMAL) return ES_NOT_HANDLED;
Window *w = ShowBuildAirToolbar(); Window *w = ShowBuildAirToolbar();
if (w == nullptr) return ES_NOT_HANDLED; if (w == nullptr) return ES_NOT_HANDLED;
return w->OnHotkey(hotkey); return w->OnHotkey(hotkey);

1
src/rail_gui.cpp
View File

@@ -769,6 +769,7 @@ struct BuildRailToolbarWindow : Window {
*/ */
static EventState RailToolbarGlobalHotkeys(int hotkey) static EventState RailToolbarGlobalHotkeys(int hotkey)
{ {
if (_game_mode != GM_NORMAL) return ES_NOT_HANDLED;
extern RailType _last_built_railtype; extern RailType _last_built_railtype;
Window *w = ShowBuildRailToolbar(_last_built_railtype); Window *w = ShowBuildRailToolbar(_last_built_railtype);
if (w == nullptr) return ES_NOT_HANDLED; if (w == nullptr) return ES_NOT_HANDLED;