RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-05 22:47:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

per game config.yml (#2418)

Browse source
This commit is contained in:
georgemoralis 2017-02-23 17:08:52 +02:00 • committed by Ivan
parent 5fce74a2a6
commit 3e0c356b0b
6 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
rpcs3/Gui/SettingsDialog.cpp
View file

@ -202,14 +202,15 @@ struct textctrl_pad : cfg_adapter
};
SettingsDialog::SettingsDialog(wxWindow* parent)
SettingsDialog::SettingsDialog(wxWindow* parent, const wxString& pergameload)
: wxDialog(parent, wxID_ANY, "Settings", wxDefaultPosition)
{
// Load default config
loaded = YAML::Load(g_cfg_defaults);
// Incrementally load config.yml
const fs::file config(fs::get_config_dir() + "/config.yml", fs::read + fs::write + fs::create);
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());
std::vector<std::unique_ptr<cfg_adapter>> pads;