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

Merge pull request #12642 from jordan-woyak/state-write-osd-errors 

Core/State: Display messages on state write failures.
This commit is contained in:
Admiral H. Curtiss 2024-03-21 03:55:05 +01:00 committed by GitHub
parent 03f2b99ffe f922129255
commit 2d5286d2e2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -402,7 +402,7 @@ static void CompressAndDumpState(CompressAndDumpState_args& save_args)
File::IOFile f(temp_filename, "wb"); File::IOFile f(temp_filename, "wb");
if (!f) if (!f)
{ {
Core::DisplayMessage("Could not save state", 2000); Core::DisplayMessage("Failed to create state file", 2000);
return; return;
} }
@ -413,6 +413,9 @@ static void CompressAndDumpState(CompressAndDumpState_args& save_args)
else else
f.WriteBytes(buffer_data, buffer_size); f.WriteBytes(buffer_data, buffer_size);
if (!f.IsGood())
Core::DisplayMessage("Failed to write state file", 2000);
const std::string last_state_filename = File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav"; const std::string last_state_filename = File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav";
const std::string last_state_dtmname = last_state_filename + ".dtm"; const std::string last_state_dtmname = last_state_filename + ".dtm";
const std::string dtmname = filename + ".dtm"; const std::string dtmname = filename + ".dtm";
@ -448,12 +451,20 @@ static void CompressAndDumpState(CompressAndDumpState_args& save_args)
// Move written state to final location. // Move written state to final location.
// TODO: This should also be atomic. This is possible on all systems, but needs a special // TODO: This should also be atomic. This is possible on all systems, but needs a special
// implementation of IOFile on Windows. // implementation of IOFile on Windows.
f.Close(); if (!f.Close())
File::Rename(temp_filename, filename); Core::DisplayMessage("Failed to close state file", 2000);
if (!File::Rename(temp_filename, filename))
{
Core::DisplayMessage("Failed to rename state file", 2000);
}
else
{
const std::filesystem::path temp_path(filename);
Core::DisplayMessage(fmt::format("Saved State to {}", temp_path.filename().string()), 2000);
}
} }
std::filesystem::path tempfilename(filename);
Core::DisplayMessage(fmt::format("Saved State to {}", tempfilename.filename().string()), 2000);
Host_UpdateMainFrame(); Host_UpdateMainFrame();
} }