Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2025-01-17 22:25:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

System: Fix loading states with different media path

Browse source
This commit is contained in:
Connor McLaughlin 2022-08-13 13:59:58 +10:00
parent 8de3e65b92
commit 6c69cf33c2
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/core/system.cpp
View file

@ -1047,7 +1047,9 @@ bool System::BootSystem(SystemBootParameters parameters)
if (!parameters.save_state.empty()) if (!parameters.save_state.empty())
{ {
// loading a state, so pull the media path from the save state to avoid a double change // loading a state, so pull the media path from the save state to avoid a double change
parameters.filename = GetMediaPathFromSaveState(parameters.save_state.c_str()); std::string state_media(GetMediaPathFromSaveState(parameters.save_state.c_str()));
if (FileSystem::FileExists(state_media.c_str()))
parameters.filename = std::move(state_media);
} }
if (parameters.filename.empty()) if (parameters.filename.empty())
@ -1777,6 +1779,7 @@ bool System::DoLoadState(ByteStream* state, bool force_software_renderer, bool u
"existing image '%s', this may result in instability."), "existing image '%s', this may result in instability."),
media_filename.c_str(), error.GetCodeAndMessage().GetCharArray(), old_media->GetFileName().c_str()); media_filename.c_str(), error.GetCodeAndMessage().GetCharArray(), old_media->GetFileName().c_str());
media = std::move(old_media); media = std::move(old_media);
header.media_subimage_index = media->GetCurrentSubImage();
} }
else else
{ {