summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/time_manager.cpp
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2020-03-08 21:20:05 +0100
committerFernando Sahmkow <fsahmkow27@gmail.com>2020-06-27 17:35:40 +0200
commit9e9c287f8b24ce9a932490cc35b3d0b5f58bb7a3 (patch)
treee977aa6c71954d9a147a20c190a425df23851085 /src/core/hle/kernel/time_manager.cpp
parentKernel: Fixes, corrections and asserts to scheduler and different svcs. (diff)
downloadyuzu-9e9c287f8b24ce9a932490cc35b3d0b5f58bb7a3.tar
yuzu-9e9c287f8b24ce9a932490cc35b3d0b5f58bb7a3.tar.gz
yuzu-9e9c287f8b24ce9a932490cc35b3d0b5f58bb7a3.tar.bz2
yuzu-9e9c287f8b24ce9a932490cc35b3d0b5f58bb7a3.tar.lz
yuzu-9e9c287f8b24ce9a932490cc35b3d0b5f58bb7a3.tar.xz
yuzu-9e9c287f8b24ce9a932490cc35b3d0b5f58bb7a3.tar.zst
yuzu-9e9c287f8b24ce9a932490cc35b3d0b5f58bb7a3.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/kernel/time_manager.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/hle/kernel/time_manager.cpp b/src/core/hle/kernel/time_manager.cpp
index cc228f5f7..941305e8e 100644
--- a/src/core/hle/kernel/time_manager.cpp
+++ b/src/core/hle/kernel/time_manager.cpp
@@ -32,8 +32,9 @@ void TimeManager::ScheduleTimeEvent(Handle& event_handle, Thread* timetask, s64
event_handle = timetask->GetGlobalHandle();
if (nanoseconds > 0) {
ASSERT(timetask);
- const s64 cycles = Core::Timing::nsToCycles(std::chrono::nanoseconds{nanoseconds});
- system.CoreTiming().ScheduleEvent(cycles, time_manager_event_type, event_handle);
+ ASSERT(timetask->GetStatus() != ThreadStatus::Ready);
+ ASSERT(timetask->GetStatus() != ThreadStatus::WaitMutex);
+ system.CoreTiming().ScheduleEvent(nanoseconds, time_manager_event_type, event_handle);
} else {
event_handle = InvalidHandle;
}