1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/hle/kernel/k_scheduler.h b/src/core/hle/kernel/k_scheduler.h
index 2308a55be..e0d052593 100644
--- a/src/core/hle/kernel/k_scheduler.h
+++ b/src/core/hle/kernel/k_scheduler.h
@@ -54,7 +54,7 @@ public:
 
     /// Returns true if the scheduler is idle
     [[nodiscard]] bool IsIdle() const {
-        return GetCurrentThread() == idle_thread;
+        return GetCurrentThread() == idle_thread.get();
     }
 
     /// Gets the timestamp for the last context switch in ticks.
@@ -174,8 +174,9 @@ private:
     void SwitchToCurrent();
 
     KThread* prev_thread{};
-    KThread* current_thread{};
-    KThread* idle_thread{};
+    std::atomic<KThread*> current_thread{};
+
+    std::shared_ptr<KThread> idle_thread;
 
     std::shared_ptr<Common::Fiber> switch_fiber{};