From 6a5e514509e13bd6df127c07e3e1ee7fa6b143ea Mon Sep 17 00:00:00 2001
From: nanahi <130121847+na-na-hi@users.noreply.github.com>
Date: Sat, 23 May 2026 08:53:46 -0400
Subject: [PATCH] input/sdl_gamepad: move controller null check to front

No need to call SDL_GameControllerGetJoystick if controller is NULL.
---
 input/sdl_gamepad.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/input/sdl_gamepad.c b/input/sdl_gamepad.c
index b61f7c9543..29213aa41d 100644
--- a/input/sdl_gamepad.c
+++ b/input/sdl_gamepad.c
@@ -187,10 +187,12 @@ static void remove_gamepad(struct mp_input_src *src, int id)
 {
     struct gamepad_priv *p = src->priv;
     SDL_GameController *controller = p->controller;
+    if (!controller)
+        return;
     SDL_Joystick* j = SDL_GameControllerGetJoystick(controller);
     SDL_JoystickID jid = SDL_JoystickInstanceID(j);
 
-    if (controller && jid == id) {
+    if (jid == id) {
         const char *name = SDL_GameControllerName(controller);
         MP_INFO(src, "removed controller: %s\n", name);
         SDL_GameControllerClose(controller);