From 69f7a83b0ebb7b4fe0a45cea0d8f91857ad02798 Mon Sep 17 00:00:00 2001 From: Vitor Kiguchi Date: Sat, 4 Apr 2020 18:20:31 -0300 Subject: [PATCH] Reenable hidapi for SDL2.0.12 and up --- src/input_common/sdl/sdl_impl.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/input_common/sdl/sdl_impl.cpp b/src/input_common/sdl/sdl_impl.cpp index f186787b8e..f48a57c9ec 100644 --- a/src/input_common/sdl/sdl_impl.cpp +++ b/src/input_common/sdl/sdl_impl.cpp @@ -474,11 +474,10 @@ SDLState::SDLState() { } // these hints are only defined on sdl2.0.9 or higher #if SDL_VERSION_ATLEAST(2, 0, 9) - // This can be set back to 1 when the compatibility problems with the controllers are - // solved. There are also hints to toggle the individual drivers. +#if !SDL_VERSION_ATLEAST(2, 0, 12) + // There are also hints to toggle the individual drivers if needed. SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI, "0"); - // This hint should probably stay as "0" as long as the hidapi PS4 led issue isn't fixed - SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS4, "0"); +#endif #endif SDL_AddEventWatch(&SDLEventWatcher, this);