aboutsummaryrefslogtreecommitdiff
path: root/src/yuzu/configuration/config.cpp
diff options
context:
space:
mode:
authorlat9nq <22451773+lat9nq@users.noreply.github.com>2021-09-02 21:40:55 -0400
committerMorph <39850852+Morph1984@users.noreply.github.com>2021-10-07 13:50:13 -0400
commitfb66a455c4c7c1e196fc1001a52325a33e50b127 (patch)
tree97782dab7d9b57b119c765e73a585a6b90484a43 /src/yuzu/configuration/config.cpp
parentf84328934f5e09894a69d9fa1d2f6a34c715321b (diff)
yuzu qt: Remove global system instances from config, WaitTree, main
Diffstat (limited to 'src/yuzu/configuration/config.cpp')
-rw-r--r--src/yuzu/configuration/config.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index eb941ce027..30a8641354 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -16,7 +16,8 @@
namespace FS = Common::FS;
-Config::Config(const std::string& config_name, ConfigType config_type) : type(config_type) {
+Config::Config(Core::System& system_, const std::string& config_name, ConfigType config_type)
+ : type(config_type), system{system_} {
global = config_type == ConfigType::GlobalConfig;
Initialize(config_name);
@@ -1593,7 +1594,7 @@ void Config::Reload() {
ReadValues();
// To apply default value changes
SaveValues();
- Core::System::GetInstance().ApplySettings();
+ system.ApplySettings();
}
void Config::Save() {