preserve-emulation/pcsx2
1
0 Fork 0
mirror of https://github.com/PCSX2/pcsx2.git synced 2026-11-14 10:10:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

pad: Fix gamepad choice not affecting rumble test on Linux

Browse Source 
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.
This commit is contained in:
Ilya Trukhanov authored and Jonathan Li committed 2021-06-26 22:09:38 +01:00
1 parent d310ae948d
commit 3c59221dd1
1 file changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files
pcsx2/PAD/Linux/wx_dialog/GamepadConfiguration.cpp
+2 -2
View File
@@ -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