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

System: Use ConfirmMessageAsync() for SBI-less boot

Browse Source 
No more nested event loops!
This commit is contained in:
Stenzek
2025-11-27 17:45:05 +10:00
parent 7b6fd224af
commit 7ce8959247
2 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/core/system.cpp
View File

@@ -1859,14 +1859,40 @@ bool System::BootSystem(SystemBootParameters parameters, Error* error)
// Load BIOS image, component setup, check for subchannel in games that need it.
if (!SetBootMode(boot_mode, disc_region, error) ||
!Initialize(std::move(disc), disc_region, parameters.force_software_renderer,
parameters.override_fullscreen.value_or(ShouldStartFullscreen()), error) ||
!CheckForRequiredSubQ(error))
parameters.override_fullscreen.value_or(ShouldStartFullscreen()), error))
{
Host::OnSystemStopping();
DestroySystem();
return false;
}
// Check for required subchannel data.
// Annoyingly we can't do this before initializing, because subchannel data can be loaded from outside the image.
if (!parameters.ignore_missing_subchannel && !CheckForRequiredSubQ(error) &&
Host::GetBoolSettingValue("CDROM", "AllowBootingWithoutSBIFile", false))
{
Host::ConfirmMessageAsync(
"Confirm Unsupported Configuration",
fmt::format(TRANSLATE_FS("System",
"You are attempting to run a libcrypt protected game without an SBI file:\n\n{0}: "
"{1}\n\nThe game will likely not run properly.\n\nPlease check the README for "
"instructions on how to add an SBI file.\n\nDo you wish to continue?"),
s_state.running_game_serial, s_state.running_game_title),
[parameters = std::move(parameters)](bool result) mutable {
if (result)
{
Host::RunOnCPUThread([parameters = std::move(parameters)]() mutable {
parameters.ignore_missing_subchannel = true;
BootSystem(std::move(parameters), nullptr);
});
}
});
Host::OnSystemStopping();
DestroySystem();
return true;
}
s_state.exe_override = std::move(exe_override);
UpdateControllers();
@@ -4252,20 +4278,6 @@ bool System::CheckForRequiredSubQ(Error* error)
WARNING_LOG("SBI file missing but required for {} ({})", s_state.running_game_serial, s_state.running_game_title);
if (Host::GetBoolSettingValue("CDROM", "AllowBootingWithoutSBIFile", false))
{
if (Host::ConfirmMessage(
"Confirm Unsupported Configuration",
LargeString::from_format(
TRANSLATE_FS("System", "You are attempting to run a libcrypt protected game without an SBI file:\n\n{0}: "
"{1}\n\nThe game will likely not run properly.\n\nPlease check the README for "
"instructions on how to add an SBI file.\n\nDo you wish to continue?"),
s_state.running_game_serial, s_state.running_game_title)))
{
return true;
}
}
Error::SetStringFmt(
error,
TRANSLATE_FS("System", "You are attempting to run a libcrypt protected game without an SBI file:\n\n{0}: "

5
src/core/system.h
View File

@@ -46,11 +46,14 @@ struct SystemBootParameters
std::string path;
std::string save_state;
std::string override_exe;
u32 media_playlist_index = 0;
std::optional<bool> override_fast_boot;
std::optional<bool> override_fullscreen;
std::optional<bool> override_start_paused;
u32 media_playlist_index = 0;
bool load_image_to_ram = false;
bool ignore_missing_subchannel = false;
bool force_software_renderer = false;
bool disable_achievements_hardcore_mode = false;
bool start_media_capture = false;