mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-05 19:08:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

SDL_XINPUT_Enabled() returns false until XInput DLL is successfully loaded

Browse Source 
We make sure we initialize XInput first, so that anything checking whether it's enabled gets a valid result based on whether we were able to load it or not.

(cherry picked from commit 8f46cb771c)
This commit is contained in:
Sam Lantinga
2024-09-06 11:19:19 -07:00
parent 5aadfd4eaf
commit f5ed158d1f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/joystick/windows/SDL_windowsjoystick.c
View File

@@ -377,7 +377,7 @@ static int SDLCALL SDL_JoystickThread(void *_data)
#ifdef SDL_JOYSTICK_XINPUT #ifdef SDL_JOYSTICK_XINPUT
/* WM_DEVICECHANGE not working, poll for new XINPUT controllers */ /* WM_DEVICECHANGE not working, poll for new XINPUT controllers */
SDL_CondWaitTimeout(s_condJoystickThread, s_mutexJoyStickEnum, 1000); SDL_CondWaitTimeout(s_condJoystickThread, s_mutexJoyStickEnum, 1000);
if (SDL_XINPUT_Enabled() && XINPUTGETCAPABILITIES) { if (SDL_XINPUT_Enabled()) {
/* scan for any change in XInput devices */ /* scan for any change in XInput devices */
Uint8 userId; Uint8 userId;
for (userId = 0; userId < XUSER_MAX_COUNT; userId++) { for (userId = 0; userId < XUSER_MAX_COUNT; userId++) {
@@ -473,12 +473,12 @@ void WINDOWS_JoystickQuit(void);
*/ */
static int WINDOWS_JoystickInit(void) static int WINDOWS_JoystickInit(void)
{ {
if (SDL_DINPUT_JoystickInit() < 0) { if (SDL_XINPUT_JoystickInit() < 0) {
WINDOWS_JoystickQuit(); WINDOWS_JoystickQuit();
return -1; return -1;
} }
if (SDL_XINPUT_JoystickInit() < 0) { if (SDL_DINPUT_JoystickInit() < 0) {
WINDOWS_JoystickQuit(); WINDOWS_JoystickQuit();
return -1; return -1;
} }

2
src/joystick/windows/SDL_xinputjoystick.c
View File

@@ -39,7 +39,7 @@ extern "C" {
/* /*
* Internal stuff. * Internal stuff.
*/ */
static SDL_bool s_bXInputEnabled = SDL_TRUE; static SDL_bool s_bXInputEnabled = SDL_FALSE;
static SDL_bool SDL_XInputUseOldJoystickMapping(void) static SDL_bool SDL_XInputUseOldJoystickMapping(void)
{ {