Merge pull request #4578 from ligfx/fixloaddefaults

ControllerEmu: Fix LoadDefaults to use ciface argument
This commit is contained in:
Mat M 2016-12-27 21:38:45 -05:00 committed by GitHub
commit 4a4d629f0e

View File

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