diff options
| author | 2019-03-25 21:06:33 -0400 | |
|---|---|---|
| committer | 2019-03-25 21:06:33 -0400 | |
| commit | 595511876e9669c09c7b60a2fa4a1164dc5d0e66 (patch) | |
| tree | dc2ab78d68f54f61d06fe0596d104cd16cbd3fbe /src/core/core_timing.cpp | |
| parent | Merge pull request #2286 from lioncash/fwd (diff) | |
| parent | core/core_timing: Make callback parameters consistent (diff) | |
| download | yuzu-595511876e9669c09c7b60a2fa4a1164dc5d0e66.tar.gz yuzu-595511876e9669c09c7b60a2fa4a1164dc5d0e66.tar.xz yuzu-595511876e9669c09c7b60a2fa4a1164dc5d0e66.zip | |
Merge pull request #2287 from lioncash/coretiming-cb
core/core_timing: Make callback parameters consistent
Diffstat (limited to 'src/core/core_timing.cpp')
| -rw-r--r-- | src/core/core_timing.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp index a0dd5db24..41adb2302 100644 --- a/src/core/core_timing.cpp +++ b/src/core/core_timing.cpp | |||
| @@ -186,7 +186,7 @@ void CoreTiming::Advance() { | |||
| 186 | Event evt = std::move(event_queue.front()); | 186 | Event evt = std::move(event_queue.front()); |
| 187 | std::pop_heap(event_queue.begin(), event_queue.end(), std::greater<>()); | 187 | std::pop_heap(event_queue.begin(), event_queue.end(), std::greater<>()); |
| 188 | event_queue.pop_back(); | 188 | event_queue.pop_back(); |
| 189 | evt.type->callback(evt.userdata, static_cast<int>(global_timer - evt.time)); | 189 | evt.type->callback(evt.userdata, global_timer - evt.time); |
| 190 | } | 190 | } |
| 191 | 191 | ||
| 192 | is_global_timer_sane = false; | 192 | is_global_timer_sane = false; |