From 0621a673502e56a24caa129051270b4a55363ad9 Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Wed, 11 Jan 2023 21:56:50 +0300 Subject: [PATCH] fix SDL_GetJoystickInstanceID() return code upon failure Reference issue: https://github.com/libsdl-org/SDL/issues/7051 --- include/SDL3/SDL_joystick.h | 4 ++-- src/joystick/SDL_joystick.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/SDL3/SDL_joystick.h b/include/SDL3/SDL_joystick.h index 2db82e107..5f67994b9 100644 --- a/include/SDL3/SDL_joystick.h +++ b/include/SDL3/SDL_joystick.h @@ -652,8 +652,8 @@ extern DECLSPEC SDL_bool SDLCALL SDL_JoystickConnected(SDL_Joystick *joystick); * Get the instance ID of an opened joystick. * * \param joystick an SDL_Joystick structure containing joystick information - * \returns the instance ID of the specified joystick on success or a negative - * error code on failure; call SDL_GetError() for more information. + * \returns the instance ID of the specified joystick on success or 0 on + * failure; call SDL_GetError() for more information. * * \since This function is available since SDL 3.0.0. * diff --git a/src/joystick/SDL_joystick.c b/src/joystick/SDL_joystick.c index 132651e51..1ff111b14 100644 --- a/src/joystick/SDL_joystick.c +++ b/src/joystick/SDL_joystick.c @@ -932,7 +932,7 @@ SDL_JoystickID SDL_GetJoystickInstanceID(SDL_Joystick *joystick) SDL_LockJoysticks(); { - CHECK_JOYSTICK_MAGIC(joystick, -1); + CHECK_JOYSTICK_MAGIC(joystick, 0); retval = joystick->instance_id; }