(svn r22714) -Fix: If there's no point in opening the rail toolbar, don't open it for people who use hotkeys either rather than only for those using GUI elements

This commit is contained in:
planetmaker 2011-08-04 14:04:15 +00:00
parent d25840978c
commit 35b7183a88

View File

@ -31,6 +31,7 @@
#include "core/geometry_func.hpp" #include "core/geometry_func.hpp"
#include "hotkeys.h" #include "hotkeys.h"
#include "engine_base.h" #include "engine_base.h"
#include "vehicle_func.h"
#include "station_map.h" #include "station_map.h"
#include "tunnelbridge_map.h" #include "tunnelbridge_map.h"
@ -849,6 +850,7 @@ Window *ShowBuildRailToolbar(RailType railtype)
EventState RailToolbarGlobalHotkeys(uint16 key, uint16 keycode) EventState RailToolbarGlobalHotkeys(uint16 key, uint16 keycode)
{ {
if (!CanBuildVehicleInfrastructure(VEH_TRAIN)) return ES_NOT_HANDLED;
extern RailType _last_built_railtype; extern RailType _last_built_railtype;
int num = CheckHotkeyMatch<BuildRailToolbarWindow>(_railtoolbar_hotkeys, keycode, NULL, true); int num = CheckHotkeyMatch<BuildRailToolbarWindow>(_railtoolbar_hotkeys, keycode, NULL, true);
if (num == -1) return ES_NOT_HANDLED; if (num == -1) return ES_NOT_HANDLED;