diff options
| author | Michael M <mchtly@gmail.com> | 2017-11-04 15:29:15 -0700 |
|---|---|---|
| committer | Michael M <mchtly@gmail.com> | 2017-11-19 12:46:39 -0800 |
| commit | ac855e2c93319622d644a99ab5f2ece012338fff (patch) | |
| tree | 3b1b73c50baa6ef1d05f70c69872458137d7a9b7 /Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp | |
| parent | 9551fe1c736fe514d0c70f01c67df9dd89ce501e (diff) | |
MappingWindow: don't store devq separately from controller default device
Diffstat (limited to 'Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp')
| -rw-r--r-- | Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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()))); } |
