gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mark gamepads as invalid if they can't be opened

Browse Source 
Fixes https://github.com/libsdl-org/SDL/issues/13129
This commit is contained in:
Sam Lantinga
2025-06-02 09:21:13 -07:00
parent a314a58e7e
commit 4b0f48c4cf
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/joystick/SDL_gamepad.c
View File

@@ -2878,6 +2878,7 @@ SDL_Gamepad *SDL_OpenGamepad(SDL_JoystickID instance_id)
gamepad->joystick = SDL_OpenJoystick(instance_id); gamepad->joystick = SDL_OpenJoystick(instance_id);
if (!gamepad->joystick) { if (!gamepad->joystick) {
SDL_SetObjectValid(gamepad, SDL_OBJECT_TYPE_GAMEPAD, false);
SDL_free(gamepad); SDL_free(gamepad);
SDL_UnlockJoysticks(); SDL_UnlockJoysticks();
return NULL; return NULL;
@@ -2886,6 +2887,7 @@ SDL_Gamepad *SDL_OpenGamepad(SDL_JoystickID instance_id)
if (gamepad->joystick->naxes) { if (gamepad->joystick->naxes) {
gamepad->last_match_axis = (SDL_GamepadBinding **)SDL_calloc(gamepad->joystick->naxes, sizeof(*gamepad->last_match_axis)); gamepad->last_match_axis = (SDL_GamepadBinding **)SDL_calloc(gamepad->joystick->naxes, sizeof(*gamepad->last_match_axis));
if (!gamepad->last_match_axis) { if (!gamepad->last_match_axis) {
SDL_SetObjectValid(gamepad, SDL_OBJECT_TYPE_GAMEPAD, false);
SDL_CloseJoystick(gamepad->joystick); SDL_CloseJoystick(gamepad->joystick);
SDL_free(gamepad); SDL_free(gamepad);
SDL_UnlockJoysticks(); SDL_UnlockJoysticks();
@@ -2895,6 +2897,7 @@ SDL_Gamepad *SDL_OpenGamepad(SDL_JoystickID instance_id)
if (gamepad->joystick->nhats) { if (gamepad->joystick->nhats) {
gamepad->last_hat_mask = (Uint8 *)SDL_calloc(gamepad->joystick->nhats, sizeof(*gamepad->last_hat_mask)); gamepad->last_hat_mask = (Uint8 *)SDL_calloc(gamepad->joystick->nhats, sizeof(*gamepad->last_hat_mask));
if (!gamepad->last_hat_mask) { if (!gamepad->last_hat_mask) {
SDL_SetObjectValid(gamepad, SDL_OBJECT_TYPE_GAMEPAD, false);
SDL_CloseJoystick(gamepad->joystick); SDL_CloseJoystick(gamepad->joystick);
SDL_free(gamepad->last_match_axis); SDL_free(gamepad->last_match_axis);
SDL_free(gamepad); SDL_free(gamepad);