mirrors/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-20 11:36:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

load config.yaml settings in a new configpergame

Browse source
This commit is contained in:
georgemoralis 2017-02-24 13:48:55 +02:00 • committed by Ivan
parent e153df4d5b
commit 14093c86a9
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
rpcs3/Gui/SettingsDialog.cpp
View file

@ -210,8 +210,15 @@ SettingsDialog::SettingsDialog(wxWindow* parent, const wxString& pergameload)
// Incrementally load config.yml
const fs::file config(!pergameload.IsEmpty() ? pergameload.ToStdString() : fs::get_config_dir() + "/config.yml", fs::read + fs::write + fs::create);
loaded += YAML::Load(config.to_string());
if (config.to_string().length() == 0 && !pergameload.IsEmpty())//empty first time gameconfig
{
const fs::file configexisted(fs::get_config_dir() + "/config.yml", fs::read + fs::write + fs::create);
loaded += YAML::Load(configexisted.to_string());
}
else
{
loaded += YAML::Load(config.to_string());
}
std::vector<std::unique_ptr<cfg_adapter>> pads;