summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2019-06-03 22:19:22 +0200
committerLioncash <mathew1800@gmail.com>2019-06-03 22:56:46 +0200
commitb73ea457cc9870b7846982a4d8633b368fe02e9a (patch)
tree2bc4e038ce3246735b33a2a5fa81c7db47d6f81c
parentinput_common/sdl/sdl_impl: Use insert_or_assign() where applicable (diff)
downloadyuzu-b73ea457cc9870b7846982a4d8633b368fe02e9a.tar
yuzu-b73ea457cc9870b7846982a4d8633b368fe02e9a.tar.gz
yuzu-b73ea457cc9870b7846982a4d8633b368fe02e9a.tar.bz2
yuzu-b73ea457cc9870b7846982a4d8633b368fe02e9a.tar.lz
yuzu-b73ea457cc9870b7846982a4d8633b368fe02e9a.tar.xz
yuzu-b73ea457cc9870b7846982a4d8633b368fe02e9a.tar.zst
yuzu-b73ea457cc9870b7846982a4d8633b368fe02e9a.zip
-rw-r--r--src/input_common/sdl/sdl_impl.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/input_common/sdl/sdl_impl.cpp b/src/input_common/sdl/sdl_impl.cpp
index edd4affe2..c5589eb73 100644
--- a/src/input_common/sdl/sdl_impl.cpp
+++ b/src/input_common/sdl/sdl_impl.cpp
@@ -33,14 +33,16 @@ static std::string GetGUID(SDL_Joystick* joystick) {
/// Creates a ParamPackage from an SDL_Event that can directly be used to create a ButtonDevice
static Common::ParamPackage SDLEventToButtonParamPackage(SDLState& state, const SDL_Event& event);
-static int SDLEventWatcher(void* userdata, SDL_Event* event) {
- SDLState* sdl_state = reinterpret_cast<SDLState*>(userdata);
+static int SDLEventWatcher(void* user_data, SDL_Event* event) {
+ auto* const sdl_state = static_cast<SDLState*>(user_data);
+
// Don't handle the event if we are configuring
if (sdl_state->polling) {
sdl_state->event_queue.Push(*event);
} else {
sdl_state->HandleGameControllerEvent(*event);
}
+
return 0;
}