From 3c59221dd1bce5d911ef409dde99bc3fe6c36a47 Mon Sep 17 00:00:00 2001 From: Ilya Trukhanov Date: Fri, 28 May 2021 15:15:16 +0300 Subject: [PATCH] pad: Fix gamepad choice not affecting rumble test on Linux The rumble test using either the checkbox or the slider in the gamepad configuration GUI always causes the first gamepad to rumble, even if other gamepads are selected in the drop-down menu. --- pcsx2/PAD/Linux/wx_dialog/GamepadConfiguration.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pcsx2/PAD/Linux/wx_dialog/GamepadConfiguration.cpp b/pcsx2/PAD/Linux/wx_dialog/GamepadConfiguration.cpp index 148921f58c..7cc4ab6bc6 100644 --- a/pcsx2/PAD/Linux/wx_dialog/GamepadConfiguration.cpp +++ b/pcsx2/PAD/Linux/wx_dialog/GamepadConfiguration.cpp @@ -114,7 +114,7 @@ void GamepadConfiguration::OnSliderReleased(wxCommandEvent& event) // convert in a float value between 0 and 1, and run rumble feedback. // 0 to 1 scales to 0x0 to 0x7FFF - s_vgamePad[m_pad_id]->TestForce(m_sl_rumble_intensity->GetValue() / (float)0x7FFF); + s_vgamePad[m_joy_map->GetSelection()]->TestForce(m_sl_rumble_intensity->GetValue() / (float)0x7FFF); } else if (sl_id == joy_slider_id) { @@ -135,7 +135,7 @@ void GamepadConfiguration::OnCheckboxChange(wxCommandEvent& event) g_conf.pad_options[m_pad_id].forcefeedback = (m_cb_rumble->GetValue()) ? (u32)1 : (u32)0; if (m_cb_rumble->GetValue()) { - s_vgamePad[m_pad_id]->TestForce(); + s_vgamePad[m_joy_map->GetSelection()]->TestForce(); m_sl_rumble_intensity->Enable(); } else