1
1
Fork 0
forked from suyu/suyu

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.
This commit is contained in:
lat9nq 2023-07-30 12:26:55 -04:00
parent 55c0b55d1d
commit 7aa848080d

View file

@ -495,10 +495,12 @@ void Widget::SetupComponent(const QString& label, std::function<void()>& load_fu
if (Settings::IsConfiguringGlobal()) { if (Settings::IsConfiguringGlobal()) {
load_func = [this, serializer, checkbox_serializer, require_checkbox, other_setting]() { load_func = [this, serializer, checkbox_serializer, require_checkbox, other_setting]() {
if (require_checkbox) { if (require_checkbox && other_setting->UsingGlobal()) {
other_setting->LoadString(checkbox_serializer()); other_setting->LoadString(checkbox_serializer());
} }
setting.LoadString(serializer()); if (setting.UsingGlobal()) {
setting.LoadString(serializer());
}
}; };
} else { } else {
layout->addWidget(restore_button); layout->addWidget(restore_button);