diff options
| author | bunnei <bunneidev@gmail.com> | 2018-08-12 22:05:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-12 22:05:48 -0400 |
| commit | ef0065ee51b65d71696cb5f2db159285c73b9d21 (patch) | |
| tree | 7ae20333761b95790d6d263539f8607084982b38 /src/core/core_timing.cpp | |
| parent | d9a4224dba6bfb7aa446b46c28865f950ef69b28 (diff) | |
| parent | 42d6bbcb7ca4abf7c90764eff1e501091b322695 (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.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp index d3bb6f8188..f977d1b325 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<>()); } |
