ruby: SDL2 input fixups

ares-emulator · Feb 20, 2025 · 6c1efb8 · 6c1efb8
1 parent 7a5174a
commit 6c1efb8
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/ruby/input/joypad/sdl.cpp b/ruby/input/joypad/sdl.cpp
@@ -94,10 +94,20 @@ struct InputJoypadSDL {
       Joypad jp;
       jp.id = id;
       jp.handle = SDL_JoystickOpen(jp.id);
+      if(!jp.handle) {
+        const char *err = SDL_GetError();
+        print("Error opening SDL joystick id ", id, ": ", err);
+        continue;
+      }
 
-      u32 axes = SDL_JoystickNumAxes(jp.handle);
-      u32 hats = SDL_JoystickNumHats(jp.handle) * 2;
-      u32 buttons = SDL_JoystickNumButtons(jp.handle);
+      s32 axes = SDL_JoystickNumAxes(jp.handle);
+      s32 hats = SDL_JoystickNumHats(jp.handle) * 2;
+      s32 buttons = SDL_JoystickNumButtons(jp.handle);
+      if(axes < 0 || hats < 0 || buttons < 0) {
+        const char *err = SDL_GetError();
+        print("Error retrieving SDL joystick information for device ", jp.handle, " at index ", id, ": ", err);
+        continue;
+      }
 
       u16 vid = SDL_JoystickGetVendor(jp.handle);
       u16 pid = SDL_JoystickGetProduct(jp.handle);