diff options
| author | Leo Lam <leolino.lam@gmail.com> | 2017-11-11 17:11:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-11 17:11:56 +0100 |
| commit | 1e24a5f309b69689e43e5876d26dd6ad2a0b0f67 (patch) | |
| tree | c773379eea2aeb76addd9f50ac8ba1dc78e19df6 /Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp | |
| parent | 338bffd1e79f53996202bf49fc864b6ab13b9482 (diff) | |
| parent | 1b1dd1d749f6a2b42a5b3a2b863382567bf786ea (diff) | |
Merge pull request #6167 from ligfx/encapsulatedefaultdevice
EmulatedController: encapsulate default device behind getters/setters
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 dd3254ac26..c121edf43a 100644 --- a/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp +++ b/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp @@ -56,9 +56,9 @@ void MappingButton::OnButtonPressed() // Avoid that the button press itself is registered as an event Common::SleepCurrentThread(100); - const auto expr = MappingCommon::DetectExpression(m_reference, dev.get(), - m_parent->GetParent()->GetDeviceQualifier(), - m_parent->GetController()->default_device); + const auto expr = MappingCommon::DetectExpression( + m_reference, dev.get(), m_parent->GetParent()->GetDeviceQualifier(), + m_parent->GetController()->GetDefaultDevice()); releaseMouse(); releaseKeyboard(); |