Merge pull request #6210 from ligfx/qtmappingwindowdontstoredevq

MappingWindow: don't store devq separately from controller default device

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("");
 }