Merge pull request #1042 from Subv/races

Fixed a bunch of race conditions when running in multicore mode.

1 files changed, 3 insertions, 0 deletions

diff --git a/src/core/core_cpu.cpp b/src/core/core_cpu.cpp
index 46a522fcd4..9b306faf6a 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();
 }