diff options
| author | 2021-07-09 10:47:42 -0400 | |
|---|---|---|
| committer | 2021-07-09 10:49:56 -0400 | |
| commit | 420987c5bf47d3a105bc9e57b02aa0fe337dadab (patch) | |
| tree | f500c32523553c1da8e60922e3c53810ea6423ad | |
| parent | Merge pull request #6563 from ReinUsesLisp/thread-worker (diff) | |
| download | yuzu-420987c5bf47d3a105bc9e57b02aa0fe337dadab.tar.gz yuzu-420987c5bf47d3a105bc9e57b02aa0fe337dadab.tar.xz yuzu-420987c5bf47d3a105bc9e57b02aa0fe337dadab.zip | |
yuzu qt: config: Only save renderer_debug as a global setting
This is a bug fix. Enabling graphics debug mode, then saving a custom
configuration causes graphics debugging to be saved and read from the
custom configuration.
Isolate it the same way we isolate the CPU settings.
| -rw-r--r-- | src/yuzu/configuration/config.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index 1a0f75373..80961c97e 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp | |||
| @@ -820,7 +820,6 @@ void Config::ReadRendererValues() { | |||
| 820 | qt_config->beginGroup(QStringLiteral("Renderer")); | 820 | qt_config->beginGroup(QStringLiteral("Renderer")); |
| 821 | 821 | ||
| 822 | ReadGlobalSetting(Settings::values.renderer_backend); | 822 | ReadGlobalSetting(Settings::values.renderer_backend); |
| 823 | ReadBasicSetting(Settings::values.renderer_debug); | ||
| 824 | ReadGlobalSetting(Settings::values.vulkan_device); | 823 | ReadGlobalSetting(Settings::values.vulkan_device); |
| 825 | ReadGlobalSetting(Settings::values.fullscreen_mode); | 824 | ReadGlobalSetting(Settings::values.fullscreen_mode); |
| 826 | ReadGlobalSetting(Settings::values.aspect_ratio); | 825 | ReadGlobalSetting(Settings::values.aspect_ratio); |
| @@ -842,6 +841,10 @@ void Config::ReadRendererValues() { | |||
| 842 | ReadGlobalSetting(Settings::values.bg_green); | 841 | ReadGlobalSetting(Settings::values.bg_green); |
| 843 | ReadGlobalSetting(Settings::values.bg_blue); | 842 | ReadGlobalSetting(Settings::values.bg_blue); |
| 844 | 843 | ||
| 844 | if (global) { | ||
| 845 | ReadBasicSetting(Settings::values.renderer_debug); | ||
| 846 | } | ||
| 847 | |||
| 845 | qt_config->endGroup(); | 848 | qt_config->endGroup(); |
| 846 | } | 849 | } |
| 847 | 850 | ||
| @@ -1342,7 +1345,6 @@ void Config::SaveRendererValues() { | |||
| 1342 | static_cast<u32>(Settings::values.renderer_backend.GetValue(global)), | 1345 | static_cast<u32>(Settings::values.renderer_backend.GetValue(global)), |
| 1343 | static_cast<u32>(Settings::values.renderer_backend.GetDefault()), | 1346 | static_cast<u32>(Settings::values.renderer_backend.GetDefault()), |
| 1344 | Settings::values.renderer_backend.UsingGlobal()); | 1347 | Settings::values.renderer_backend.UsingGlobal()); |
| 1345 | WriteBasicSetting(Settings::values.renderer_debug); | ||
| 1346 | WriteGlobalSetting(Settings::values.vulkan_device); | 1348 | WriteGlobalSetting(Settings::values.vulkan_device); |
| 1347 | WriteGlobalSetting(Settings::values.fullscreen_mode); | 1349 | WriteGlobalSetting(Settings::values.fullscreen_mode); |
| 1348 | WriteGlobalSetting(Settings::values.aspect_ratio); | 1350 | WriteGlobalSetting(Settings::values.aspect_ratio); |
| @@ -1367,6 +1369,10 @@ void Config::SaveRendererValues() { | |||
| 1367 | WriteGlobalSetting(Settings::values.bg_green); | 1369 | WriteGlobalSetting(Settings::values.bg_green); |
| 1368 | WriteGlobalSetting(Settings::values.bg_blue); | 1370 | WriteGlobalSetting(Settings::values.bg_blue); |
| 1369 | 1371 | ||
| 1372 | if (global) { | ||
| 1373 | WriteBasicSetting(Settings::values.renderer_debug); | ||
| 1374 | } | ||
| 1375 | |||
| 1370 | qt_config->endGroup(); | 1376 | qt_config->endGroup(); |
| 1371 | } | 1377 | } |
| 1372 | 1378 | ||