diff options
| author | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2023-07-30 12:26:55 -0400 |
|---|---|---|
| committer | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2023-07-30 12:26:55 -0400 |
| commit | 7aa848080df1e5672e6df2231f16fa37d68c03bc (patch) | |
| tree | 2a135e2eaab7a1b4856796d2b260c7d063f6810f | |
| parent | 55c0b55d1d34c9f9c2b0309ee4e7533d9a535ed0 (diff) | |
shared_widget: Only save global settings as needed
Fixes a potential but not reproduced issue where the custom config
is being applied to the global config.
| -rw-r--r-- | src/yuzu/configuration/shared_widget.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/yuzu/configuration/shared_widget.cpp b/src/yuzu/configuration/shared_widget.cpp index 410fa80cd4..bdb38c8ea5 100644 --- a/src/yuzu/configuration/shared_widget.cpp +++ b/src/yuzu/configuration/shared_widget.cpp @@ -495,10 +495,12 @@ void Widget::SetupComponent(const QString& label, std::function<void()>& load_fu if (Settings::IsConfiguringGlobal()) { load_func = [this, serializer, checkbox_serializer, require_checkbox, other_setting]() { - if (require_checkbox) { + if (require_checkbox && other_setting->UsingGlobal()) { other_setting->LoadString(checkbox_serializer()); } - setting.LoadString(serializer()); + if (setting.UsingGlobal()) { + setting.LoadString(serializer()); + } }; } else { layout->addWidget(restore_button); |