hos: Prevent sysmmc boot on emummc patch failure if emummc is forced

This commit is contained in:
Aurora Wright 2020-10-14 19:37:36 +02:00
parent 85d43147ee
commit e3421fd44e

View file

@ -949,11 +949,19 @@ int hos_launch(ini_sec_t *cfg)
{ {
EHPRINTFARGS("Failed to apply '%s'!", unappliedPatch); EHPRINTFARGS("Failed to apply '%s'!", unappliedPatch);
gfx_puts("\nPress POWER to continue.\nPress VOL to go to the menu.\n"); bool prevent_sysmmc_boot = false;
if (!strcmp(unappliedPatch, "emummc") && ctxt.emummc_forced)
prevent_sysmmc_boot = true;
if (prevent_sysmmc_boot)
gfx_puts("\nPress POWER or VOL to go to the menu.\n");
else
gfx_puts("\nPress POWER to continue.\nPress VOL to go to the menu.\n");
display_backlight_brightness(h_cfg.backlight, 1000); display_backlight_brightness(h_cfg.backlight, 1000);
u32 btn = btn_wait(); u32 btn = btn_wait();
if (!(btn & BTN_POWER)) if (prevent_sysmmc_boot || !(btn & BTN_POWER))
{ {
_free_launch_components(&ctxt); _free_launch_components(&ctxt);
goto error; // MUST stop here, because if user requests 'nogc' but it's not applied, their GC controller gets updated! goto error; // MUST stop here, because if user requests 'nogc' but it's not applied, their GC controller gets updated!