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/MappingButton.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp') diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp index c121edf43a..fb38472eed 100644 --- a/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp +++ b/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp @@ -57,8 +57,7 @@ void MappingButton::OnButtonPressed() Common::SleepCurrentThread(100); const auto expr = MappingCommon::DetectExpression( - m_reference, dev.get(), m_parent->GetParent()->GetDeviceQualifier(), - m_parent->GetController()->GetDefaultDevice()); + m_reference, dev.get(), m_parent->GetController()->GetDefaultDevice()); releaseMouse(); releaseKeyboard(); @@ -90,7 +89,8 @@ void MappingButton::Clear() void MappingButton::Update() { const auto lock = ControllerEmu::EmulatedController::GetStateLock(); - m_reference->UpdateReference(g_controller_interface, m_parent->GetParent()->GetDeviceQualifier()); + m_reference->UpdateReference(g_controller_interface, + m_parent->GetController()->GetDefaultDevice()); setText(EscapeAmpersand(QString::fromStdString(m_reference->GetExpression()))); } -- cgit v1.2.3