From 0f433ea8824097991e98d8bb7c563228cddd8b30 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Wed, 7 Jun 2017 21:12:19 +0200 Subject: [PATCH] use global config as default for game config again (#2845) this was missing as a result to the previous fix of the game configs --- rpcs3/rpcs3qt/emu_settings.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/rpcs3/rpcs3qt/emu_settings.cpp b/rpcs3/rpcs3qt/emu_settings.cpp index b567052235..4084ec6cd2 100644 --- a/rpcs3/rpcs3qt/emu_settings.cpp +++ b/rpcs3/rpcs3qt/emu_settings.cpp @@ -105,14 +105,22 @@ static QStringList getOptions(cfg_location location) emu_settings::emu_settings(const std::string& path) : QObject() { - currentSettings = YAML::Load(g_cfg_defaults); - // Create config path if necessary fs::create_path(fs::get_config_dir() + path); - // Incrementally load config.yml - config = fs::file(fs::get_config_dir() + path + "/config.yml", fs::read + fs::write + fs::create); + // Load default config + currentSettings = YAML::Load(g_cfg_defaults); + + // Add global config + config = fs::file(fs::get_config_dir() + "/config.yml", fs::read + fs::write + fs::create); currentSettings += YAML::Load(config.to_string()); + + // Add game config + if (!path.empty()) + { + config = fs::file(fs::get_config_dir() + path + "/config.yml", fs::read + fs::write + fs::create); + currentSettings += YAML::Load(config.to_string()); + } } emu_settings::~emu_settings()