diff options
| author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2020-03-12 19:55:53 -0400 |
|---|---|---|
| committer | Fernando Sahmkow <fsahmkow27@gmail.com> | 2020-06-27 11:35:49 -0400 |
| commit | 1a5f2e290ba831ad6d18514bcdfcd92673643e4b (patch) | |
| tree | c9864cce7d381dd97d83a307e2ea0b031f3f51aa /src/core/cpu_manager.cpp | |
| parent | db68fba4a634ab6127ed485f55c41b5e1a05bc10 (diff) | |
CPU_Manager: Correct stopping on SingleCore.
Diffstat (limited to 'src/core/cpu_manager.cpp')
| -rw-r--r-- | src/core/cpu_manager.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/core/cpu_manager.cpp b/src/core/cpu_manager.cpp index 9e2e6d49fb..e92b0fb376 100644 --- a/src/core/cpu_manager.cpp +++ b/src/core/cpu_manager.cpp @@ -39,9 +39,14 @@ void CpuManager::Initialize() { void CpuManager::Shutdown() { running_mode = false; Pause(false); - for (std::size_t core = 0; core < Core::Hardware::NUM_CPU_CORES; core++) { - core_data[core].host_thread->join(); - core_data[core].host_thread.reset(); + if (is_multicore) { + for (std::size_t core = 0; core < Core::Hardware::NUM_CPU_CORES; core++) { + core_data[core].host_thread->join(); + core_data[core].host_thread.reset(); + } + } else { + core_data[0].host_thread->join(); + core_data[0].host_thread.reset(); } } |