From 170e723cc77ec0234cbca87f259850f980040764 Mon Sep 17 00:00:00 2001 From: Leon Krieg Date: Sat, 17 Dec 2016 11:52:17 +0100 Subject: [PATCH] Handle SDL event 0x304 by doing nothing (#3670) --- components/sdlutil/sdlinputwrapper.cpp | 5 +++++ components/sdlutil/sdlinputwrapper.hpp | 1 + 2 files changed, 6 insertions(+) diff --git a/components/sdlutil/sdlinputwrapper.cpp b/components/sdlutil/sdlinputwrapper.cpp index 6482f378e..e8a0823f8 100644 --- a/components/sdlutil/sdlinputwrapper.cpp +++ b/components/sdlutil/sdlinputwrapper.cpp @@ -108,6 +108,11 @@ InputWrapper::InputWrapper(SDL_Window* window, osg::ref_ptr v case SDL_TEXTINPUT: mKeyboardListener->textInput(evt.text); break; + +#if SDL_VERSION_ATLEAST(2, 0, 4) + case SDL_KEYMAPCHANGED: + break; +#endif case SDL_JOYHATMOTION: //As we manage everything with GameController, don't even bother with these. case SDL_JOYAXISMOTION: case SDL_JOYBUTTONDOWN: diff --git a/components/sdlutil/sdlinputwrapper.hpp b/components/sdlutil/sdlinputwrapper.hpp index a821b9012..62d6a565c 100644 --- a/components/sdlutil/sdlinputwrapper.hpp +++ b/components/sdlutil/sdlinputwrapper.hpp @@ -6,6 +6,7 @@ #include #include +#include #include "OISCompat.hpp" #include "events.hpp"