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 #5855 from leoetlino/config-reload 

Config: Reload game INI on title change
This commit is contained in:
Leo Lam 2017-08-01 13:40:05 +08:00 committed by GitHub
parent fe65b26d53 4129aa2438
commit 4dcc931d97
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -241,12 +241,6 @@ bool BootCore(std::unique_ptr<BootParameters> boot)
// Load game specific settings // Load game specific settings
if (!std::holds_alternative<BootParameters::IPL>(boot->parameters)) if (!std::holds_alternative<BootParameters::IPL>(boot->parameters))
{ {
std::string game_id = SConfig::GetInstance().GetGameID();
u16 revision = SConfig::GetInstance().GetRevision();
Config::AddLayer(ConfigLoaders::GenerateGlobalGameConfigLoader(game_id, revision));
Config::AddLayer(ConfigLoaders::GenerateLocalGameConfigLoader(game_id, revision));
IniFile game_ini = StartUp.LoadGameIni(); IniFile game_ini = StartUp.LoadGameIni();
// General settings // General settings

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

@ -791,6 +791,9 @@ void SConfig::SetRunningGameMetadata(const std::string& game_id, u64 title_id, u
m_title_description = title_database.Describe(m_game_id, type); m_title_description = title_database.Describe(m_game_id, type);
NOTICE_LOG(CORE, "Active title: %s", m_title_description.c_str()); NOTICE_LOG(CORE, "Active title: %s", m_title_description.c_str());
Config::AddLayer(ConfigLoaders::GenerateGlobalGameConfigLoader(game_id, revision));
Config::AddLayer(ConfigLoaders::GenerateLocalGameConfigLoader(game_id, revision));
if (Core::IsRunning()) if (Core::IsRunning())
{ {
// TODO: have a callback mechanism for title changes? // TODO: have a callback mechanism for title changes?