aboutsummaryrefslogtreecommitdiff
path: root/src/core/core_timing.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-08-12 22:05:48 -0400
committerGitHub <noreply@github.com>2018-08-12 22:05:48 -0400
commite4ed5bc83610b7538f3a8ea355a3ed2437c87671 (patch)
tree7ae20333761b95790d6d263539f8607084982b38 /src/core/core_timing.cpp
parentde5d431eec05f8cc126491135e1f97f5022f7102 (diff)
parent2e7802ad7d4ab80d9547c3ee44ad3a1341dea625 (diff)
Merge pull request #1042 from Subv/races
Fixed a bunch of race conditions when running in multicore mode.
Diffstat (limited to 'src/core/core_timing.cpp')
-rw-r--r--src/core/core_timing.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp
index d3bb6f818..f977d1b32 100644
--- a/src/core/core_timing.cpp
+++ b/src/core/core_timing.cpp
@@ -135,11 +135,9 @@ void ClearPendingEvents() {
void ScheduleEvent(s64 cycles_into_future, const EventType* event_type, u64 userdata) {
ASSERT(event_type != nullptr);
s64 timeout = GetTicks() + cycles_into_future;
-
// If this event needs to be scheduled before the next advance(), force one early
if (!is_global_timer_sane)
ForceExceptionCheck(cycles_into_future);
-
event_queue.emplace_back(Event{timeout, event_fifo_id++, userdata, event_type});
std::push_heap(event_queue.begin(), event_queue.end(), std::greater<>());
}