mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-10-20 23:19:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve GCC Warnings

Browse source
This commit is contained in:
Minty-Meeo 2022-05-01 03:12:28 -05:00
commit 69e32dea52
10 changed files with 40 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Source/Core/Core/State.cpp
View file

@ -419,7 +419,7 @@ void SaveAs(const std::string& filename, bool wait)
// Then actually do the write.
bool is_write_mode;
{
std::lock_guard lk(g_cs_current_buffer);
std::lock_guard lk2(g_cs_current_buffer);
g_current_buffer.resize(buffer_size);
ptr = g_current_buffer.data();
PointerWrap p(&ptr, buffer_size, PointerWrap::Mode::Write);
@ -438,7 +438,7 @@ void SaveAs(const std::string& filename, bool wait)
save_args.wait = wait;
{
std::lock_guard lk(g_save_thread_mutex);
std::lock_guard lk3(g_save_thread_mutex);
Flush();
g_save_thread = std::thread(CompressAndDumpState, save_args);
}
@ -572,7 +572,7 @@ void LoadAs(const std::string& filename)
// Save temp buffer for undo load state
if (!Movie::IsJustStartingRecordingInputFromSaveState())
{
std::lock_guard lk(g_cs_undo_load_buffer);
std::lock_guard lk2(g_cs_undo_load_buffer);
SaveToBuffer(g_undo_load_buffer);
if (Movie::IsMovieActive())
Movie::SaveRecording(File::GetUserPath(D_STATESAVES_IDX) + "undo.dtm");