From 7aa848080df1e5672e6df2231f16fa37d68c03bc Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Sun, 30 Jul 2023 12:26:55 -0400 Subject: [PATCH] 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. --- src/yuzu/configuration/shared_widget.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/yuzu/configuration/shared_widget.cpp b/src/yuzu/configuration/shared_widget.cpp index 410fa80cd..bdb38c8ea 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& 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);