diff options
| author | 2023-07-30 12:26:55 -0400 | |
|---|---|---|
| committer | 2023-07-30 12:26:55 -0400 | |
| commit | 7aa848080df1e5672e6df2231f16fa37d68c03bc (patch) | |
| tree | 2a135e2eaab7a1b4856796d2b260c7d063f6810f | |
| parent | config(qt): Write the UiGeneral category (diff) | |
| download | yuzu-7aa848080df1e5672e6df2231f16fa37d68c03bc.tar.gz yuzu-7aa848080df1e5672e6df2231f16fa37d68c03bc.tar.xz yuzu-7aa848080df1e5672e6df2231f16fa37d68c03bc.zip | |
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 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<void()>& load_fu | |||
| 495 | 495 | ||
| 496 | if (Settings::IsConfiguringGlobal()) { | 496 | if (Settings::IsConfiguringGlobal()) { |
| 497 | load_func = [this, serializer, checkbox_serializer, require_checkbox, other_setting]() { | 497 | load_func = [this, serializer, checkbox_serializer, require_checkbox, other_setting]() { |
| 498 | if (require_checkbox) { | 498 | if (require_checkbox && other_setting->UsingGlobal()) { |
| 499 | other_setting->LoadString(checkbox_serializer()); | 499 | other_setting->LoadString(checkbox_serializer()); |
| 500 | } | 500 | } |
| 501 | setting.LoadString(serializer()); | 501 | if (setting.UsingGlobal()) { |
| 502 | setting.LoadString(serializer()); | ||
| 503 | } | ||
| 502 | }; | 504 | }; |
| 503 | } else { | 505 | } else { |
| 504 | layout->addWidget(restore_button); | 506 | layout->addWidget(restore_button); |