diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2021-10-14 14:12:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-14 14:12:22 -0400 |
| commit | b02d662980a401057d2ff7c1522d47f9f6538d81 (patch) | |
| tree | 2717ff56b111eb1adfcb712e14ad69f25ab76b68 /src/yuzu/configuration/config.cpp | |
| parent | 894b483a0d619c3ceaa79fa0ff4cef6d37301f9c (diff) | |
| parent | b6894bfc5b86c2fae0b401f2cfc294a08994781d (diff) | |
Merge pull request #6774 from lat9nq/remove-global-yuzu
yuzu qt: Remove global system instances
Diffstat (limited to 'src/yuzu/configuration/config.cpp')
| -rw-r--r-- | src/yuzu/configuration/config.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index eb941ce02..30a864135 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() { |