diff options
| author | JMC47 <JMC4789@gmail.com> | 2019-10-15 22:55:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-15 22:55:59 -0400 |
| commit | a1405f70a251cb21763d9f9a3be84cb6650d6957 (patch) | |
| tree | f2060d74456dc8aa73cf6fc58ea01c8ef3be0d88 /Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp | |
| parent | 4425d05c4a0965beedf45ccaddf566fbe7b9f7c6 (diff) | |
| parent | b120b0872658335e1f23422e61b2e2b16f1aaab6 (diff) | |
Merge pull request #8407 from jordan-woyak/dj-turntable-fix
ControllerEmu: Clamp results of trigger/slider states to prevent integer overflow later on.
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp index f8865329b9..0b702b6657 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp @@ -34,6 +34,6 @@ Slider::StateData Slider::GetState() const ControlState deadzone = m_deadzone_setting.GetValue() / 100; const ControlState state = controls[1]->control_ref->State() - controls[0]->control_ref->State(); - return {ApplyDeadzone(state, deadzone)}; + return {std::clamp(ApplyDeadzone(state, deadzone), -1.0, 1.0)}; } } // namespace ControllerEmu |
