From ac855e2c93319622d644a99ab5f2ece012338fff Mon Sep 17 00:00:00 2001 From: Michael M Date: Sat, 4 Nov 2017 15:29:15 -0700 Subject: MappingWindow: don't store devq separately from controller default device --- Source/Core/DolphinQt2/Config/Mapping/MappingCommon.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Source/Core/DolphinQt2/Config/Mapping/MappingCommon.cpp') 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(""); } -- cgit v1.2.3