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

VMManager: Fix fast forward boot with GS dumps

This commit is contained in:
Stenzek 2023-06-19 18:07:04 +10:00 committed by Connor McLaughlin
parent 0e4bf501f1
commit fbb50e2895
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pcsx2/VMManager.cpp
View File

@ -995,8 +995,6 @@ bool VMManager::Initialize(VMBootParameters boot_params)
std::string state_to_load; std::string state_to_load;
s_fast_boot_requested = boot_params.fast_boot.value_or(static_cast<bool>(EmuConfig.EnableFastBoot));
s_elf_override = std::move(boot_params.elf_override); s_elf_override = std::move(boot_params.elf_override);
if (!boot_params.save_state.empty()) if (!boot_params.save_state.empty())
state_to_load = std::move(boot_params.save_state); state_to_load = std::move(boot_params.save_state);
@ -1078,6 +1076,12 @@ bool VMManager::Initialize(VMBootParameters boot_params)
// Figure out which game we're running! This also loads game settings. // Figure out which game we're running! This also loads game settings.
UpdateDiscDetails(true); UpdateDiscDetails(true);
// Read fast boot setting late so it can be overridden per-game.
// ELFs must be fast booted, and GS dumps are never fast booted.
s_fast_boot_requested =
(boot_params.fast_boot.value_or(static_cast<bool>(EmuConfig.EnableFastBoot)) || !s_elf_override.empty()) &&
!GSDumpReplayer::IsReplayingDump();
if (!s_elf_override.empty()) if (!s_elf_override.empty())
{ {
if (!FileSystem::FileExists(s_elf_override.c_str())) if (!FileSystem::FileExists(s_elf_override.c_str()))