archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-04 05:51:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Prevent minor race in Progress Dialog Server

Browse source
This commit is contained in:
Megamouse 2021-01-30 23:45:10 +01:00 • committed by Ivan
parent c464e90d5d
commit 31cdd7bdd2
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
rpcs3/Emu/System.cpp
View file

@ -372,12 +372,17 @@ namespace
// Update progress // Update progress
while (thread_ctrl::state() != thread_state::aborting) while (thread_ctrl::state() != thread_state::aborting)
{ {
if (ftotal != g_progr_ftotal || fdone != g_progr_fdone || ptotal != g_progr_ptotal || pdone != g_progr_pdone) const u32 ftotal_new = g_progr_ftotal;
const u32 fdone_new = g_progr_fdone;
const u32 ptotal_new = g_progr_ptotal;
const u32 pdone_new = g_progr_pdone;
if (ftotal != ftotal_new || fdone != fdone_new || ptotal != ptotal_new || pdone != pdone_new)
{ {
ftotal = g_progr_ftotal; ftotal = ftotal_new;
fdone = g_progr_fdone; fdone = fdone_new;
ptotal = g_progr_ptotal; ptotal = ptotal_new;
pdone = g_progr_pdone; pdone = pdone_new;
// Compute new progress in percents // Compute new progress in percents
const u32 total = ftotal + ptotal; const u32 total = ftotal + ptotal;
@ -418,9 +423,9 @@ namespace
} }
// Cleanup // Cleanup
g_progr_ftotal -= fdone; g_progr_ftotal -= ftotal;
g_progr_fdone -= fdone; g_progr_fdone -= fdone;
g_progr_ptotal -= pdone; g_progr_ptotal -= ptotal;
g_progr_pdone -= pdone; g_progr_pdone -= pdone;
if (dlg) if (dlg)