diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2016-06-26 04:03:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-26 04:03:33 +0200 |
| commit | c1fa1e67497ed38623f63d1457e1992e56287833 (patch) | |
| tree | ab08f49876092b20db0d05faabfa769c76fb2abc /Source/Core/InputCommon/ControllerEmu.cpp | |
| parent | e31a4d1f0731603d0396e592e23cf7acd0457397 (diff) | |
| parent | 8678133e8746fdc20f7d012005ebf2db370ddccc (diff) | |
Merge pull request #3923 from leoetlino/ciface-small-cleanup
ControllerInterface: Small cleanup
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu.cpp b/Source/Core/InputCommon/ControllerEmu.cpp index 4d333e1d23..54d25748ad 100644 --- a/Source/Core/InputCommon/ControllerEmu.cpp +++ b/Source/Core/InputCommon/ControllerEmu.cpp @@ -242,9 +242,10 @@ void ControllerEmu::LoadDefaults(const ControllerInterface& ciface) IniFile::Section sec; LoadConfig(&sec); - if (ciface.Devices().size()) + const std::string& default_device_string = g_controller_interface.GetDefaultDeviceString(); + if (!default_device_string.empty()) { - default_device.FromDevice(ciface.Devices()[0]); + default_device.FromString(default_device_string); UpdateDefaultDevice(); } } |