diff options
| author | bunnei <bunneidev@gmail.com> | 2018-08-13 04:05:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-13 04:05:48 +0200 |
| commit | e4ed5bc83610b7538f3a8ea355a3ed2437c87671 (patch) | |
| tree | 7ae20333761b95790d6d263539f8607084982b38 /src/core/core_cpu.cpp | |
| parent | Merge pull request #1041 from Subv/duplicated_mutex (diff) | |
| parent | Core/HLE: Make the 'reschedule_pending' flag atomic. (diff) | |
| download | yuzu-e4ed5bc83610b7538f3a8ea355a3ed2437c87671.tar yuzu-e4ed5bc83610b7538f3a8ea355a3ed2437c87671.tar.gz yuzu-e4ed5bc83610b7538f3a8ea355a3ed2437c87671.tar.bz2 yuzu-e4ed5bc83610b7538f3a8ea355a3ed2437c87671.tar.lz yuzu-e4ed5bc83610b7538f3a8ea355a3ed2437c87671.tar.xz yuzu-e4ed5bc83610b7538f3a8ea355a3ed2437c87671.tar.zst yuzu-e4ed5bc83610b7538f3a8ea355a3ed2437c87671.zip | |
Diffstat (limited to 'src/core/core_cpu.cpp')
| -rw-r--r-- | src/core/core_cpu.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/core_cpu.cpp b/src/core/core_cpu.cpp index 46a522fcd..9b306faf6 100644 --- a/src/core/core_cpu.cpp +++ b/src/core/core_cpu.cpp @@ -14,6 +14,7 @@ #include "core/core_timing.h" #include "core/hle/kernel/scheduler.h" #include "core/hle/kernel/thread.h" +#include "core/hle/lock.h" #include "core/settings.h" namespace Core { @@ -125,6 +126,8 @@ void Cpu::Reschedule() { } reschedule_pending = false; + // Lock the global kernel mutex when we manipulate the HLE state + std::lock_guard<std::recursive_mutex> lock(HLE::g_hle_lock); scheduler->Reschedule(); } |