BramReuling/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-06-11 17:05:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge commit '0621a67350' into main

Browse source
This commit is contained in:
Sam Lantinga 2023-01-11 22:16:02 -08:00
commit ff36830ead
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/SDL3/SDL_joystick.h
View file

@ -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.
*

2
src/joystick/SDL_joystick.c
View file

@ -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;
}