summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp')
-rw-r--r--Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp
index 9bbf1b17a1..4c1f230c4b 100644
--- a/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp
@@ -12,6 +12,9 @@
namespace MappingCommon
{
+constexpr int INPUT_DETECT_TIME = 3000;
+constexpr int OUTPUT_DETECT_TIME = 2000;
+
QString GetExpressionForControl(const QString& control_name,
const ciface::Core::DeviceQualifier& control_device,
const ciface::Core::DeviceQualifier& default_device, Quote quote)
@@ -41,7 +44,9 @@ QString GetExpressionForControl(const QString& control_name,
QString DetectExpression(ControlReference* reference, ciface::Core::Device* device,
const ciface::Core::DeviceQualifier& default_device, Quote quote)
{
- ciface::Core::Device::Control* const ctrl = reference->Detect(5000, device);
+ const int ms = reference->IsInput() ? INPUT_DETECT_TIME : OUTPUT_DETECT_TIME;
+
+ ciface::Core::Device::Control* const ctrl = reference->Detect(ms, device);
if (ctrl)
{