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/InputCommon/ControllerEmu/ControlGroup/ControlGroup.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/InputCommon/ControllerEmu/ControlGroup/ControlGroup.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.cpp index 24d4a4c36e..1cc2ac1865 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.cpp @@ -78,7 +78,7 @@ void ControlGroup::LoadConfig(IniFile::Section* sec, const std::string& defdev, for (auto& ai : ext->attachments) { - ai->default_device.FromString(defdev); + ai->SetDefaultDevice(defdev); ai->LoadConfig(sec, base + ai->GetName() + "/"); if (ai->GetName() == extname) |