Fix unplugging controller sometimes crashing game

Could crash if the ID wasn't in the dictionary.
The old code also didn't properly close everything
(it would close either the jostick or the gamepad, but not both).

Author: Susko3

osu.Framework/Platform/SDL2/SDL2Window_Input.cs

@@ -275,8 +275,7 @@ private void handleControllerDeviceEvent(SDL_ControllerDeviceEvent evtCdevice)
                     break;
 
                 case SDL_EventType.SDL_CONTROLLERDEVICEREMOVED:
-                    SDL_GameControllerClose(controllers[evtCdevice.which].ControllerHandle);
-                    controllers.Remove(evtCdevice.which);
+                    removeJoystick(evtCdevice.which);
                     break;
 
                 case SDL_EventType.SDL_CONTROLLERDEVICEREMAPPED:
@@ -323,6 +322,20 @@ private void addJoystick(int which)
             controllers[instanceID] = new SDL2ControllerBindings(joystick, controller);
         }
 
+        private void removeJoystick(int which)
+        {
+            int instanceID = SDL_JoystickGetDeviceInstanceID(which);
+
+            if (controllers.Remove(instanceID, out var controller))
+            {
+                if (controller.ControllerHandle != IntPtr.Zero)
+                    SDL_GameControllerClose(controller.ControllerHandle);
+
+                if (controller.JoystickHandle != IntPtr.Zero)
+                    SDL_JoystickClose(controller.JoystickHandle);
+            }
+        }
+
         /// <summary>
         /// Populates <see cref="controllers"/> with joysticks that are already connected.
         /// </summary>
@@ -343,12 +356,7 @@ private void handleJoyDeviceEvent(SDL_JoyDeviceEvent evtJdevice)
                     break;
 
                 case SDL_EventType.SDL_JOYDEVICEREMOVED:
-                    // if the joystick is already closed, ignore it
-                    if (!controllers.ContainsKey(evtJdevice.which))
-                        break;
-
-                    SDL_JoystickClose(controllers[evtJdevice.which].JoystickHandle);
-                    controllers.Remove(evtJdevice.which);
+                    removeJoystick(evtJdevice.which);
                     break;
             }
         }

osu.Framework/Platform/SDL3/SDL3Window_Input.cs

@@ -322,8 +322,7 @@ private void handleControllerDeviceEvent(SDL_GamepadDeviceEvent evtCdevice)
                     break;
 
                 case SDL_EventType.SDL_EVENT_GAMEPAD_REMOVED:
-                    SDL_CloseGamepad(controllers[evtCdevice.which].GamepadHandle);
-                    controllers.Remove(evtCdevice.which);
+                    removeJoystick(evtCdevice.which);
                     break;
 
                 case SDL_EventType.SDL_EVENT_GAMEPAD_REMAPPED:
@@ -368,6 +367,18 @@ private void addJoystick(SDL_JoystickID instanceID)
             controllers[instanceID] = new SDL3ControllerBindings(joystick, controller);
         }
 
+        private void removeJoystick(SDL_JoystickID instanceID)
+        {
+            if (controllers.Remove(instanceID, out var controller))
+            {
+                if (controller.GamepadHandle != null)
+                    SDL_CloseGamepad(controller.GamepadHandle);
+
+                if (controller.JoystickHandle != null)
+                    SDL_CloseJoystick(controller.JoystickHandle);
+            }
+        }
+
         /// <summary>
         /// Populates <see cref="controllers"/> with joysticks that are already connected.
         /// </summary>
@@ -393,12 +404,7 @@ private void handleJoyDeviceEvent(SDL_JoyDeviceEvent evtJdevice)
                     break;
 
                 case SDL_EventType.SDL_EVENT_JOYSTICK_REMOVED:
-                    // if the joystick is already closed, ignore it
-                    if (!controllers.ContainsKey(evtJdevice.which))
-                        break;
-
-                    SDL_CloseJoystick(controllers[evtJdevice.which].JoystickHandle);
-                    controllers.Remove(evtJdevice.which);
+                    removeJoystick(evtJdevice.which);
                     break;
             }
         }