early-access version 2286

2021-12-07 12:04:29 +01:00
parent c4fa174d53
commit ef7e874dd4
33 changed files with 772 additions and 642 deletions
--- a/src/core/hle/kernel/time_manager.cpp
+++ b/src/core/hle/kernel/time_manager.cpp
@@ -5,6 +5,7 @@
 #include "common/assert.h"
 #include "core/core.h"
 #include "core/core_timing.h"
+#include "core/hle/kernel/k_scheduler.h"
 #include "core/hle/kernel/k_thread.h"
 #include "core/hle/kernel/time_manager.h"

@@ -15,7 +16,10 @@ TimeManager::TimeManager(Core::System& system_) : system{system_} {
        Core::Timing::CreateEvent("Kernel::TimeManagerCallback",
                                  [this](std::uintptr_t thread_handle, std::chrono::nanoseconds) {
                                      KThread* thread = reinterpret_cast<KThread*>(thread_handle);
-                                      thread->Wakeup();
+                                      {
+                                          KScopedSchedulerLock sl(system.Kernel());
+                                          thread->OnTimer();
+                                      }
                                  });
 }