summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp
diff options
context:
space:
mode:
authorJMC47 <JMC4789@gmail.com>2019-03-13 19:00:24 -0400
committerGitHub <noreply@github.com>2019-03-13 19:00:24 -0400
commit011ecd92e8e2b0b78471cc7ad394b6ed1f7a451e (patch)
treeee12d70ff3889b093c2696715eace0952aee8ccb /Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp
parentbc9e9caf19749778d01b9721a1ff92acccf70fac (diff)
parentc389d68186ea7fa95d763d7bb55bc09e5a45c4cd (diff)
Merge pull request #7829 from jordan-woyak/detect-input-improve
ControllerInterface/DolphinQt: Improve input detection.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp
index 21e39bc416..400f9b078c 100644
--- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp
@@ -259,7 +259,7 @@ std::string Joystick::Hat::GetName() const
ControlState Joystick::Axis::GetState() const
{
- return std::max(0.0, ControlState(m_axis - m_base) / m_range);
+ return ControlState(m_axis - m_base) / m_range;
}
ControlState Joystick::Button::GetState() const