Merge pull request #8523 from liamwhite/sc-oopsie

cpu_manager: properly check idle on return from preemption

src/core/cpu_manager.cpp

@@ -194,9 +194,11 @@ void CpuManager::PreemptSingleCore(bool from_running_enviroment) {
     {
         auto& scheduler = system.Kernel().Scheduler(current_core);
         scheduler.Reload(scheduler.GetSchedulerCurrentThread());
+        if (!scheduler.IsIdle()) {
             idle_count = 0;
         }
     }
+}
 
 void CpuManager::ShutdownThread() {
     auto& kernel = system.Kernel();

src/core/hle/kernel/k_scheduler.h

@@ -55,6 +55,11 @@ public:
         return idle_thread;
     }
 
+    /// Returns true if the scheduler is idle
+    [[nodiscard]] bool IsIdle() const {
+        return GetSchedulerCurrentThread() == idle_thread;
+    }
+
     /// Gets the timestamp for the last context switch in ticks.
     [[nodiscard]] u64 GetLastContextSwitchTicks() const;