From 86453b8107ebd9137b66d61f28e830bd9d9151fb Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Wed, 9 Apr 2025 19:09:27 -0700 Subject: [PATCH] SDL: Check for _mSDLOpenJoystick null return --- src/platform/sdl/sdl-events.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/platform/sdl/sdl-events.c b/src/platform/sdl/sdl-events.c index ca8345d22..df5218407 100644 --- a/src/platform/sdl/sdl-events.c +++ b/src/platform/sdl/sdl-events.c @@ -396,6 +396,10 @@ void mSDLUpdateJoysticks(struct mSDLEvents* events, const struct Configuration* events->players[i]->joystick = NULL; } struct SDL_JoystickCombo* joystick = _mSDLOpenJoystick(events, event.jdevice.which); + if (!joystick) { + mLOG(SDL_EVENTS, ERROR, "SDL joystick hotplug attach failed: %s", SDL_GetError()); + continue; + } for (i = 0; i < events->playersAttached && i < MAX_PLAYERS; ++i) { if (joysticks[i] != -1) {