The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-13 00:58:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6167 from ligfx/encapsulatedefaultdevice

Browse Source 
EmulatedController: encapsulate default device behind getters/setters
This commit is contained in:
Leo Lam
2017-11-11 17:11:56 +01:00
committed by GitHub
parent 338bffd1e7 1b1dd1d749
commit 1e24a5f309
8 changed files with 52 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp
View File

@ -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();