From b120b0872658335e1f23422e61b2e2b16f1aaab6 Mon Sep 17 00:00:00 2001
From: Jordan Woyak <jordan.woyak@gmail.com>
Date: Tue, 15 Oct 2019 15:35:07 -0500
Subject: ControllerEmu: Clamp results of trigger/slider states to prevent
 integer overflow later on.

---
 Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.cpp')

diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.cpp
index 3b3e68f291..4cd8df7874 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.cpp
@@ -48,7 +48,7 @@ void MixedTriggers::GetState(u16* const digital, const u16* bitmasks, ControlSta
   {
     const ControlState button_value = ApplyDeadzone(controls[i]->control_ref->State(), deadzone);
     ControlState analog_value =
-        ApplyDeadzone(controls[trigger_count + i]->control_ref->State(), deadzone);
+        std::min(ApplyDeadzone(controls[trigger_count + i]->control_ref->State(), deadzone), 1.0);
 
     // Apply threshold:
     if (button_value > threshold)
-- 
cgit v1.2.3