summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar lat9nq2020-07-14 00:49:17 -0400
committerGravatar lat9nq2020-07-14 00:49:17 -0400
commite02687ff47a7004aeb87bae8bf6ee2438dbd9455 (patch)
tree117b214638bd1c2238786f08876781a9b0756424 /src
parentMerge pull request #4280 from jbeich/system-libusb (diff)
downloadyuzu-e02687ff47a7004aeb87bae8bf6ee2438dbd9455.tar.gz
yuzu-e02687ff47a7004aeb87bae8bf6ee2438dbd9455.tar.xz
yuzu-e02687ff47a7004aeb87bae8bf6ee2438dbd9455.zip
configure_general: Explicitly guard use_multi_core when applying settings
This is likely an oversight during a rebase. Guards use_multi_core to be only set when the global value is in use. It should not make a difference given the current code base, but makes the code sensible.
Diffstat (limited to 'src')
-rw-r--r--src/yuzu/configuration/configure_general.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/yuzu/configuration/configure_general.cpp b/src/yuzu/configuration/configure_general.cpp
index 1fb62d1cf..20316c9cc 100644
--- a/src/yuzu/configuration/configure_general.cpp
+++ b/src/yuzu/configuration/configure_general.cpp
@@ -65,6 +65,8 @@ void ConfigureGeneral::ApplyConfiguration() {
65 Settings::values.use_frame_limit.SetValue(ui->toggle_frame_limit->checkState() == 65 Settings::values.use_frame_limit.SetValue(ui->toggle_frame_limit->checkState() ==
66 Qt::Checked); 66 Qt::Checked);
67 Settings::values.frame_limit.SetValue(ui->frame_limit->value()); 67 Settings::values.frame_limit.SetValue(ui->frame_limit->value());
68 }
69 if (Settings::values.use_multi_core.UsingGlobal()) {
68 Settings::values.use_multi_core.SetValue(ui->use_multi_core->isChecked()); 70 Settings::values.use_multi_core.SetValue(ui->use_multi_core->isChecked());
69 } 71 }
70 } else { 72 } else {