ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Core/State: Guard SaveAs() and LoadAs() with a mutex.

This commit is contained in:
Admiral H. Curtiss 2022-02-05 19:49:06 +01:00
parent 09a0ba06c0
commit 56ea1c1d74
No known key found for this signature in database
GPG Key ID: F051B4C4044F33FB
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Core/Core/State.cpp
View File

@ -64,7 +64,7 @@ static AfterLoadCallbackFunc s_on_after_load_callback;
// Temporary undo state buffer // Temporary undo state buffer
static std::vector<u8> g_undo_load_buffer; static std::vector<u8> g_undo_load_buffer;
static std::vector<u8> g_current_buffer; static std::vector<u8> g_current_buffer;
static bool s_load_or_save_in_progress; static std::mutex s_load_or_save_in_progress_mutex;
static std::mutex g_cs_undo_load_buffer; static std::mutex g_cs_undo_load_buffer;
static std::mutex g_cs_current_buffer; static std::mutex g_cs_current_buffer;
@ -403,11 +403,10 @@ static void CompressAndDumpState(CompressAndDumpState_args save_args)
void SaveAs(const std::string& filename, bool wait) void SaveAs(const std::string& filename, bool wait)
{ {
if (s_load_or_save_in_progress) std::unique_lock lk(s_load_or_save_in_progress_mutex, std::try_to_lock);
if (!lk)
return; return;
s_load_or_save_in_progress = true;
Core::RunOnCPUThread( Core::RunOnCPUThread(
[&] { [&] {
// Measure the size of the buffer. // Measure the size of the buffer.
@ -446,8 +445,6 @@ void SaveAs(const std::string& filename, bool wait)
} }
}, },
true); true);
s_load_or_save_in_progress = false;
} }
bool ReadHeader(const std::string& filename, StateHeader& header) bool ReadHeader(const std::string& filename, StateHeader& header)
@ -550,17 +547,18 @@ static void LoadFileStateData(const std::string& filename, std::vector<u8>& ret_
void LoadAs(const std::string& filename) void LoadAs(const std::string& filename)
{ {
if (!Core::IsRunning() || s_load_or_save_in_progress) if (!Core::IsRunning())
{
return; return;
}
else if (NetPlay::IsNetPlayRunning()) if (NetPlay::IsNetPlayRunning())
{ {
OSD::AddMessage("Loading savestates is disabled in Netplay to prevent desyncs"); OSD::AddMessage("Loading savestates is disabled in Netplay to prevent desyncs");
return; return;
} }
s_load_or_save_in_progress = true; std::unique_lock lk(s_load_or_save_in_progress_mutex, std::try_to_lock);
if (!lk)
return;
Core::RunOnCPUThread( Core::RunOnCPUThread(
[&] { [&] {
@ -617,8 +615,6 @@ void LoadAs(const std::string& filename)
s_on_after_load_callback(); s_on_after_load_callback();
}, },
true); true);
s_load_or_save_in_progress = false;
} }
void SetOnAfterLoadCallback(AfterLoadCallbackFunc callback) void SetOnAfterLoadCallback(AfterLoadCallbackFunc callback)