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

Fixed incorrect error message when a joystick can't be opened

Browse Source
This commit is contained in:
Sam Lantinga
2025-01-02 16:52:59 -08:00
parent 2c0a8363a5
commit 9f7b2c3595
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/testcontroller.c
View File

@@ -910,8 +910,10 @@ static void AddController(SDL_JoystickID id, bool verbose)
new_controller->id = id; new_controller->id = id;
new_controller->joystick = SDL_OpenJoystick(id); new_controller->joystick = SDL_OpenJoystick(id);
new_controller->num_axes = SDL_GetNumJoystickAxes(new_controller->joystick); if (new_controller->joystick) {
new_controller->axis_state = (AxisState *)SDL_calloc(new_controller->num_axes, sizeof(*new_controller->axis_state)); new_controller->num_axes = SDL_GetNumJoystickAxes(new_controller->joystick);
new_controller->axis_state = (AxisState *)SDL_calloc(new_controller->num_axes, sizeof(*new_controller->axis_state));
}
joystick = new_controller->joystick; joystick = new_controller->joystick;
if (joystick) { if (joystick) {
@@ -2002,8 +2004,7 @@ int main(int argc, char *argv[])
} }
SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI, "1"); SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI, "1");
SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS4_RUMBLE, "1"); SDL_SetHint(SDL_HINT_JOYSTICK_ENHANCED_REPORTS, "auto");
SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS5_RUMBLE, "1");
SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_STEAM, "1"); SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_STEAM, "1");
SDL_SetHint(SDL_HINT_JOYSTICK_ROG_CHAKRAM, "1"); SDL_SetHint(SDL_HINT_JOYSTICK_ROG_CHAKRAM, "1");
SDL_SetHint(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, "1"); SDL_SetHint(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, "1");