summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinQt2/Config/Mapping/MappingCommon.cpp
diff options
context:
space:
mode:
authorMichael M <mchtly@gmail.com>2017-11-04 15:29:15 -0700
committerMichael M <mchtly@gmail.com>2017-11-19 12:46:39 -0800
commitac855e2c93319622d644a99ab5f2ece012338fff (patch)
tree3b1b73c50baa6ef1d05f70c69872458137d7a9b7 /Source/Core/DolphinQt2/Config/Mapping/MappingCommon.cpp
parent9551fe1c736fe514d0c70f01c67df9dd89ce501e (diff)
MappingWindow: don't store devq separately from controller default device
Diffstat (limited to 'Source/Core/DolphinQt2/Config/Mapping/MappingCommon.cpp')
-rw-r--r--Source/Core/DolphinQt2/Config/Mapping/MappingCommon.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingCommon.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingCommon.cpp
index 43960cf762..e1f8bda9f3 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/MappingCommon.cpp
+++ b/Source/Core/DolphinQt2/Config/Mapping/MappingCommon.cpp
@@ -35,15 +35,14 @@ QString GetExpressionForControl(const QString& control_name,
}
QString DetectExpression(ControlReference* reference, ciface::Core::Device* device,
- const ciface::Core::DeviceQualifier& m_devq,
const ciface::Core::DeviceQualifier& default_device)
{
ciface::Core::Device::Control* const ctrl = reference->Detect(5000, device);
if (ctrl)
{
- return MappingCommon::GetExpressionForControl(QString::fromStdString(ctrl->GetName()), m_devq,
- default_device);
+ return MappingCommon::GetExpressionForControl(QString::fromStdString(ctrl->GetName()),
+ default_device, default_device);
}
return QStringLiteral("");
}