diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2021-08-02 23:58:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-02 23:58:41 -0400 |
| commit | d16a337d98979fd7bdda2a7b0482d5e0f5c76d22 (patch) | |
| tree | bcf275111b058118f5904c3005b1b7ee5871fc6c /src | |
| parent | ffe553edbf8c87f5f4535bf49b04c32917ca7367 (diff) | |
| parent | 6ab0c6a808f53006bcb391a0a73e8fb4237d8cb5 (diff) | |
Merge pull request #6805 from lat9nq/fix-user-profiles
config: Only read/write current_user on global config
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/configuration/config.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index 2b20fca8a9..380379eb4f 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -873,10 +873,6 @@ void Config::ReadShortcutValues() { void Config::ReadSystemValues() { qt_config->beginGroup(QStringLiteral("System")); - ReadBasicSetting(Settings::values.current_user); - Settings::values.current_user = std::clamp<int>(Settings::values.current_user.GetValue(), 0, - Service::Account::MAX_USERS - 1); - ReadGlobalSetting(Settings::values.language_index); ReadGlobalSetting(Settings::values.region_index); @@ -897,6 +893,10 @@ void Config::ReadSystemValues() { } if (global) { + ReadBasicSetting(Settings::values.current_user); + Settings::values.current_user = std::clamp<int>(Settings::values.current_user.GetValue(), 0, + Service::Account::MAX_USERS - 1); + const auto custom_rtc_enabled = ReadSetting(QStringLiteral("custom_rtc_enabled"), false).toBool(); if (custom_rtc_enabled) { @@ -1406,7 +1406,6 @@ void Config::SaveShortcutValues() { void Config::SaveSystemValues() { qt_config->beginGroup(QStringLiteral("System")); - WriteBasicSetting(Settings::values.current_user); WriteGlobalSetting(Settings::values.language_index); WriteGlobalSetting(Settings::values.region_index); WriteGlobalSetting(Settings::values.time_zone_index); @@ -1418,6 +1417,8 @@ void Config::SaveSystemValues() { 0, Settings::values.rng_seed.UsingGlobal()); if (global) { + WriteBasicSetting(Settings::values.current_user); + WriteSetting(QStringLiteral("custom_rtc_enabled"), Settings::values.custom_rtc.has_value(), false); WriteSetting(QStringLiteral("custom_rtc"), |