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

VMManager: Close memcards on boot failure 

And get rid of some double shutdowns.
This commit is contained in:
Stenzek 2023-06-20 13:00:09 +10:00 committed by Connor McLaughlin
parent 4c67c165fa
commit 497e06bcd9
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pcsx2/VMManager.cpp
View File

@ -1109,11 +1109,7 @@ bool VMManager::Initialize(VMBootParameters boot_params)
return false; return false;
} }
ScopedGuard close_cdvd_files = [] { ScopedGuard close_cdvd_files(&CDVDsys_ClearFiles);
CDVDsys_ClearFiles();
if (GSDumpReplayer::IsReplayingDump())
GSDumpReplayer::Shutdown();
};
// Playing GS dumps don't need a BIOS. // Playing GS dumps don't need a BIOS.
if (!GSDumpReplayer::IsReplayingDump()) if (!GSDumpReplayer::IsReplayingDump())
@ -1136,15 +1132,21 @@ bool VMManager::Initialize(VMBootParameters boot_params)
} }
} }
FileMcd_EmuOpen();
Console.WriteLn("Opening CDVD..."); Console.WriteLn("Opening CDVD...");
if (!DoCDVDopen()) if (!DoCDVDopen())
{ {
Host::ReportErrorAsync("Startup Error", "Failed to initialize CDVD."); Host::ReportErrorAsync("Startup Error", "Failed to initialize CDVD.");
CDVDsys_ClearFiles();
return false; return false;
} }
ScopedGuard close_cdvd(&DoCDVDclose);
// Must be before updating serial because of folder memcards.
if (!GSDumpReplayer::IsReplayingDump())
{
Console.WriteLn("Opening memory cards...");
FileMcd_EmuOpen();
}
ScopedGuard close_memcards(&FileMcd_EmuClose);
// 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);
@ -1161,7 +1163,6 @@ bool VMManager::Initialize(VMBootParameters boot_params)
{ {
Host::ReportErrorAsync("Error", fmt::format("Requested boot ELF '{}' does not exist.", s_elf_override)); Host::ReportErrorAsync("Error", fmt::format("Requested boot ELF '{}' does not exist.", s_elf_override));
DoCDVDclose(); DoCDVDclose();
CDVDsys_ClearFiles();
return false; return false;
} }
@ -1179,16 +1180,10 @@ bool VMManager::Initialize(VMBootParameters boot_params)
if (!state_to_load.empty() && Achievements::ChallengeModeActive() && if (!state_to_load.empty() && Achievements::ChallengeModeActive() &&
!Achievements::ConfirmChallengeModeDisable("Resuming state")) !Achievements::ConfirmChallengeModeDisable("Resuming state"))
{ {
DoCDVDclose();
CDVDsys_ClearFiles();
return false; return false;
} }
#endif #endif
ScopedGuard close_cdvd = [] {
DoCDVDclose();
CDVDsys_ClearFiles();
};
EmuConfig.LimiterMode = GetInitialLimiterMode(); EmuConfig.LimiterMode = GetInitialLimiterMode();
Console.WriteLn("Opening GS..."); Console.WriteLn("Opening GS...");
@ -1258,6 +1253,7 @@ bool VMManager::Initialize(VMBootParameters boot_params)
close_pad.Cancel(); close_pad.Cancel();
close_spu2.Cancel(); close_spu2.Cancel();
close_gs.Cancel(); close_gs.Cancel();
close_memcards.Cancel();
close_cdvd.Cancel(); close_cdvd.Cancel();
close_cdvd_files.Cancel(); close_cdvd_files.Cancel();
close_state.Cancel(); close_state.Cancel();