piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7563 from delroth/crashfix

Browse Source 
SystemTimers: fix a 1-in-1000 crash happening in throttler performance reporting
This commit is contained in:
Pierre Bourdon 2018-11-10 20:52:57 +01:00 committed by GitHub
commit f1c41c9a62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/HW/SystemTimers.cpp
View File

@ -253,7 +253,7 @@ double GetEstimatedEmulationPerformance()
u64 ts_now, ts_before; // In microseconds u64 ts_now, ts_before; // In microseconds
{ {
std::lock_guard<std::mutex> lk(s_emu_to_real_time_mutex); 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; s_emu_to_real_time_index - 1;
size_t index_before = s_emu_to_real_time_index; size_t index_before = s_emu_to_real_time_index;