From e02687ff47a7004aeb87bae8bf6ee2438dbd9455 Mon Sep 17 00:00:00 2001
From: lat9nq <lat9nq@virginia.edu>
Date: Tue, 14 Jul 2020 00:49:17 -0400
Subject: [PATCH] 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.
---
 src/yuzu/configuration/configure_general.cpp | 2 ++
 1 file changed, 2 insertions(+)

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() {
             Settings::values.use_frame_limit.SetValue(ui->toggle_frame_limit->checkState() ==
                                                       Qt::Checked);
             Settings::values.frame_limit.SetValue(ui->frame_limit->value());
+        }
+        if (Settings::values.use_multi_core.UsingGlobal()) {
             Settings::values.use_multi_core.SetValue(ui->use_multi_core->isChecked());
         }
     } else {