ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
parent 59db5cd43c 905750553f
commit 4a4d629f0e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/InputCommon/ControllerEmu.cpp
View File

@ -317,7 +317,7 @@ void ControllerEmu::LoadDefaults(const ControllerInterface& ciface)
IniFile::Section sec; IniFile::Section sec;
LoadConfig(&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()) if (!default_device_string.empty())
{ {
default_device.FromString(default_device_string); default_device.FromString(default_device_string);