starred/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2026-02-08 23:34:32 +00:00
Code Issues 1.1k Packages Projects Releases 20 Wiki Activity

System: Always use async hardcore cancel on boot

Browse Source 
No blocking event loops.
This commit is contained in:
Stenzek
2025-11-27 17:18:18 +10:00
parent e142a321f2
commit 249f8cf4a0
1 changed files with 14 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/core/system.cpp
View File

@@ -1831,36 +1831,21 @@ bool System::BootSystem(SystemBootParameters parameters, Error* error)
{
if ((!parameters.save_state.empty() || !exe_override.empty()) && Achievements::IsHardcoreModeActive())
{
const bool is_exe_override_boot = parameters.save_state.empty();
bool cancelled;
if (FullscreenUI::IsInitialized())
{
Achievements::ConfirmHardcoreModeDisableAsync(is_exe_override_boot ?
TRANSLATE("Achievements", "Overriding executable") :
TRANSLATE("Achievements", "Resuming state"),
[parameters = std::move(parameters)](bool approved) mutable {
if (approved)
{
parameters.disable_achievements_hardcore_mode = true;
BootSystem(std::move(parameters), nullptr);
}
});
cancelled = true;
}
else
{
cancelled = !Achievements::ConfirmHardcoreModeDisable(is_exe_override_boot ?
TRANSLATE("Achievements", "Overriding executable") :
TRANSLATE("Achievements", "Resuming state"));
}
Achievements::ConfirmHardcoreModeDisableAsync(parameters.save_state.empty() ?
TRANSLATE_SV("Achievements", "Resuming state") :
TRANSLATE_SV("Achievements", "Overriding executable"),
[parameters = std::move(parameters)](bool approved) mutable {
if (approved)
{
parameters.disable_achievements_hardcore_mode = true;
BootSystem(std::move(parameters), nullptr);
}
});
if (cancelled)
{
// Technically a failure, but user-initiated. Returning false here would try to display a non-existent error.
Host::OnSystemStopping();
DestroySystem();
return true;
}
// Technically a failure, but user-initiated. Returning false here would try to display a non-existent error.
Host::OnSystemStopping();
DestroySystem();
return true;
}
}