From e313568a27dfe1e7570352d1d3f0d170cbb76733 Mon Sep 17 00:00:00 2001 From: Ted John Date: Sat, 27 May 2017 19:59:59 +0100 Subject: [PATCH] Initialise UiContext input fields This was causing undefined data to appear in _keysPressed which caused shortcuts to be invoked on startup. --- src/openrct2-ui/UiContext.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/openrct2-ui/UiContext.cpp b/src/openrct2-ui/UiContext.cpp index 8782685331..4ff77cd9e4 100644 --- a/src/openrct2-ui/UiContext.cpp +++ b/src/openrct2-ui/UiContext.cpp @@ -75,12 +75,12 @@ private: // Input TextComposition _textComposition; - CursorState _cursorState; - uint32 _lastKeyPressed; - const uint8 * _keysState; - uint8 _keysPressed[256]; - uint32 _lastGestureTimestamp; - float _gestureRadius; + CursorState _cursorState = { 0 }; + uint32 _lastKeyPressed = 0; + const uint8 * _keysState = nullptr; + uint8 _keysPressed[256] = { 0 }; + uint32 _lastGestureTimestamp = 0; + float _gestureRadius = 0; public: UiContext() @@ -217,7 +217,7 @@ public: { SDL_SetWindowGrab(_window, value ? SDL_TRUE : SDL_FALSE); } - + void SetKeysPressed(uint32 keysym, uint8 scancode) override { _lastKeyPressed = keysym;