mirrors/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-08-02 22:30:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix potential race condition

Browse source
This commit is contained in:
Megamouse 2024-11-15 09:53:15 +01:00
commit 12869f519b
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rpcs3/Emu/system_progress.hpp
View file

@ -38,10 +38,11 @@ public:
scoped_progress_dialog(const std::string& text) noexcept scoped_progress_dialog(const std::string& text) noexcept
{ {
ensure(!text.empty()); ensure(!text.empty());
m_text = text;
std::tie(m_prev, m_prev_id, m_id) = g_progr_text.atomic_op([this](progress_dialog_string_t& progr) std::tie(m_prev, m_prev_id, m_id) = g_progr_text.atomic_op([this, text](progress_dialog_string_t& progr)
{ {
m_text = text;
std::string old = progr.m_text ? progr.m_text : std::string(); std::string old = progr.m_text ? progr.m_text : std::string();
progr.m_user_count++; progr.m_user_count++;
progr.m_update_id++; progr.m_update_id++;
@ -59,11 +60,12 @@ public:
scoped_progress_dialog& operator=(const std::string& text) noexcept scoped_progress_dialog& operator=(const std::string& text) noexcept
{ {
ensure(!text.empty()); ensure(!text.empty());
m_text = text;
// This method is destroying the previous value and replacing it with a new one // This method is destroying the previous value and replacing it with a new one
std::tie(m_prev, m_prev_id, m_id) = g_progr_text.atomic_op([this](progress_dialog_string_t& progr) std::tie(m_prev, m_prev_id, m_id) = g_progr_text.atomic_op([this, text](progress_dialog_string_t& progr)
{ {
m_text = text;
if (m_id == progr.m_update_id) if (m_id == progr.m_update_id)
{ {
progr.m_update_id = m_prev_id; progr.m_update_id = m_prev_id;