piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-07 13:38:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5418 from MerryMage/config-again-and-again

Browse Source 
VideoConfig: Port to layered configuration system
This commit is contained in:
shuffle2
2017-06-05 21:11:04 -07:00
committed by GitHub
parent 192fec50b9 b6a99e1b9c
commit c8166951a0
32 changed files with 961 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Core/ConfigManager.cpp
View File

@ -12,6 +12,7 @@
#include "Common/CDUtils.h"
#include "Common/CommonPaths.h"
#include "Common/CommonTypes.h"
#include "Common/Config/Config.h"
#include "Common/FileUtil.h"
#include "Common/Logging/Log.h"
#include "Common/MsgHandler.h"
@ -22,6 +23,7 @@
#include "Core/Analytics.h"
#include "Core/Boot/Boot.h"
#include "Core/Boot/Boot_DOL.h"
#include "Core/Config/Config.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/FifoPlayer/FifoDataFile.h"
@ -88,6 +90,8 @@ void SConfig::SaveSettings()
SaveUSBPassthroughSettings(ini);
ini.Save(File::GetUserPath(F_DOLPHINCONFIG_IDX));
Config::Save();
}
namespace
@ -394,6 +398,8 @@ void SConfig::SaveSettingsToSysconf()
void SConfig::LoadSettings()
{
Config::Load();
INFO_LOG(BOOT, "Loading Settings from %s", File::GetUserPath(F_DOLPHINCONFIG_IDX).c_str());
IniFile ini;
ini.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX));