From 919ebd01903f592989940dfde2a515a7dc70c1ef Mon Sep 17 00:00:00 2001 From: TheLastRar Date: Fri, 14 Feb 2025 10:23:12 +0000 Subject: [PATCH] SDLInputSource: Correct joystick_id type --- pcsx2/Input/SDLInputSource.cpp | 2 +- pcsx2/Input/SDLInputSource.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pcsx2/Input/SDLInputSource.cpp b/pcsx2/Input/SDLInputSource.cpp index 976c573344..d07a88b2e5 100644 --- a/pcsx2/Input/SDLInputSource.cpp +++ b/pcsx2/Input/SDLInputSource.cpp @@ -688,7 +688,7 @@ bool SDLInputSource::OpenDevice(int index, bool is_gamepad) return false; } - const int joystick_id = SDL_GetJoystickID(joystick); + const SDL_JoystickID joystick_id = SDL_GetJoystickID(joystick); int player_id = gamepad ? SDL_GetGamepadPlayerIndex(gamepad) : SDL_GetJoystickPlayerIndex(joystick); for (auto it = m_controllers.begin(); it != m_controllers.end(); ++it) { diff --git a/pcsx2/Input/SDLInputSource.h b/pcsx2/Input/SDLInputSource.h index d3717c1bc9..324a4c2e9f 100644 --- a/pcsx2/Input/SDLInputSource.h +++ b/pcsx2/Input/SDLInputSource.h @@ -54,7 +54,7 @@ private: SDL_Joystick* joystick; u16 rumble_intensity[2]; int haptic_left_right_effect; - int joystick_id; + SDL_JoystickID joystick_id; int player_id; bool use_gamepad_rumble;