ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pad: fix crash on touching disabled slider in macOS

This commit is contained in:
TellowKrinkle 2021-02-04 00:59:46 -06:00 committed by tellowkrinkle
parent 4890a26ae0
commit 84e0f315ad
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2/PAD/Linux/wx_dialog/GamepadConfiguration.cpp
View File

@ -105,6 +105,8 @@ void GamepadConfiguration::OnSliderReleased(wxCommandEvent& event)
{ {
wxSlider* sl_tmp = (wxSlider*)event.GetEventObject(); wxSlider* sl_tmp = (wxSlider*)event.GetEventObject();
int sl_id = sl_tmp->GetId(); int sl_id = sl_tmp->GetId();
if (!sl_tmp->IsEnabled()) // wxCocoa sends events even when the button is disabled
return;
if (sl_id == rumble_slider_id) if (sl_id == rumble_slider_id)
{ {
@ -112,7 +114,7 @@ void GamepadConfiguration::OnSliderReleased(wxCommandEvent& event)
// convert in a float value between 0 and 1, and run rumble feedback. // convert in a float value between 0 and 1, and run rumble feedback.
// 0 to 1 scales to 0x0 to 0x7FFF // 0 to 1 scales to 0x0 to 0x7FFF
s_vgamePad[m_pad_id]->TestForce(m_sl_rumble_intensity->GetValue() / 0x7FFF); s_vgamePad[m_pad_id]->TestForce(m_sl_rumble_intensity->GetValue() / (float)0x7FFF);
} }
else if (sl_id == joy_slider_id) else if (sl_id == joy_slider_id)
{ {