diff options
| author | Mat M <mathew1800@gmail.com> | 2016-12-27 21:38:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-27 21:38:45 -0500 |
| commit | 4a4d629f0e1804167da010dc8f647fd6cbed9319 (patch) | |
| tree | d5deb02e0011b386047915e2d6450c0d146bfa2f /Source/Core/InputCommon/ControllerEmu.cpp | |
| parent | 59db5cd43c31009d2a9065f480f462da405f10c7 (diff) | |
| parent | 905750553f3b4e5ad42758c642cd9ca161244cb9 (diff) | |
Merge pull request #4578 from ligfx/fixloaddefaults
ControllerEmu: Fix LoadDefaults to use ciface argument
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu.cpp b/Source/Core/InputCommon/ControllerEmu.cpp index 4a7600dca7..4ea4b59637 100644 --- a/Source/Core/InputCommon/ControllerEmu.cpp +++ b/Source/Core/InputCommon/ControllerEmu.cpp @@ -317,7 +317,7 @@ void ControllerEmu::LoadDefaults(const ControllerInterface& ciface) IniFile::Section sec; LoadConfig(&sec); - const std::string& default_device_string = g_controller_interface.GetDefaultDeviceString(); + const std::string& default_device_string = ciface.GetDefaultDeviceString(); if (!default_device_string.empty()) { default_device.FromString(default_device_string); |