summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/core.cpp2
-rw-r--r--src/core/settings.cpp5
-rw-r--r--src/core/settings.h3
3 files changed, 1 insertions, 9 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 0961c0819..4dc31ce66 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -159,7 +159,7 @@ struct System::Impl {
159 device_memory = std::make_unique<Core::DeviceMemory>(); 159 device_memory = std::make_unique<Core::DeviceMemory>();
160 160
161 is_multicore = Settings::values.use_multi_core.GetValue(); 161 is_multicore = Settings::values.use_multi_core.GetValue();
162 is_async_gpu = is_multicore || Settings::values.use_asynchronous_gpu_emulation.GetValue(); 162 is_async_gpu = Settings::values.use_asynchronous_gpu_emulation.GetValue();
163 163
164 kernel.SetMulticore(is_multicore); 164 kernel.SetMulticore(is_multicore);
165 cpu_manager.SetMulticore(is_multicore); 165 cpu_manager.SetMulticore(is_multicore);
diff --git a/src/core/settings.cpp b/src/core/settings.cpp
index 47d9ecf9a..39306509a 100644
--- a/src/core/settings.cpp
+++ b/src/core/settings.cpp
@@ -148,9 +148,4 @@ void RestoreGlobalState(bool is_powered_on) {
148 values.motion_enabled.SetGlobal(true); 148 values.motion_enabled.SetGlobal(true);
149} 149}
150 150
151void Sanitize() {
152 values.use_asynchronous_gpu_emulation.SetValue(
153 values.use_asynchronous_gpu_emulation.GetValue() || values.use_multi_core.GetValue());
154}
155
156} // namespace Settings 151} // namespace Settings
diff --git a/src/core/settings.h b/src/core/settings.h
index d5f8d2b7e..0cd3c0c84 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -257,7 +257,4 @@ void LogSettings();
257// Restore the global state of all applicable settings in the Values struct 257// Restore the global state of all applicable settings in the Values struct
258void RestoreGlobalState(bool is_powered_on); 258void RestoreGlobalState(bool is_powered_on);
259 259
260// Fixes settings that are known to cause issues with the emulator
261void Sanitize();
262
263} // namespace Settings 260} // namespace Settings