diff options
| author | Leo Lam <leolino.lam@gmail.com> | 2017-12-15 20:50:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-15 20:50:06 +0100 |
| commit | a4592bc3c54d37111b916d707beb2152fdebf5fb (patch) | |
| tree | da63ad590a90a32a15a36180ab2b22a378a7bd31 /Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp | |
| parent | 7e7f1fe7136bf6381902e6e17564a2d2d32cc263 (diff) | |
| parent | 6b7d5bb80c296f765494f6a11d230a96fa7143d9 (diff) | |
Merge pull request #6210 from ligfx/qtmappingwindowdontstoredevq
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()))); } |
