diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp
index 01aa95d3a0..ae94fec8e3 100644
--- a/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp
@@ -68,10 +68,7 @@ QString DetectExpression(QPushButton* button, ciface::Core::DeviceContainer& dev
   // Avoid that the button press itself is registered as an event
   Common::SleepCurrentThread(50);
 
-  std::shared_ptr<ciface::Core::Device> device;
-  ciface::Core::Device::Input* input;
-
-  std::tie(device, input) = device_container.DetectInput(INPUT_DETECT_TIME, device_strings);
+  const auto [device, input] = device_container.DetectInput(INPUT_DETECT_TIME, device_strings);
 
   const auto timer = new QTimer(button);