summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2018-11-10 20:52:57 +0100
committerGitHub <noreply@github.com>2018-11-10 20:52:57 +0100
commitf1c41c9a62eed665da7ba4dc995ea1c70b22ef87 (patch)
tree173d650f46d1f7174be34b81b8b325f1107a3a6d /Source/Core
parent6e9eb7c07c9661b1a3348f433f0d70c20fd9140d (diff)
parenta9f7df5b15e3407796fc8c6ff54eb18862885c71 (diff)
Merge pull request #7563 from delroth/crashfix
SystemTimers: fix a 1-in-1000 crash happening in throttler performance reporting
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/HW/SystemTimers.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/Core/HW/SystemTimers.cpp b/Source/Core/Core/HW/SystemTimers.cpp
index d12b413f00..eedaa8a0c8 100644
--- a/Source/Core/Core/HW/SystemTimers.cpp
+++ b/Source/Core/Core/HW/SystemTimers.cpp
@@ -253,7 +253,7 @@ double GetEstimatedEmulationPerformance()
u64 ts_now, ts_before; // In microseconds
{
std::lock_guard<std::mutex> lk(s_emu_to_real_time_mutex);
- size_t index_now = s_emu_to_real_time_index == 0 ? s_emu_to_real_time_ring_buffer.size() :
+ size_t index_now = s_emu_to_real_time_index == 0 ? s_emu_to_real_time_ring_buffer.size() - 1 :
s_emu_to_real_time_index - 1;
size_t index_before = s_emu_to_real_time_index;