hekate/nyx: adjust handling of ini return values

This commit is contained in:
CTCaer
2026-02-22 03:23:44 +02:00
parent 719c109d4e
commit 8e3771afbb
8 changed files with 18 additions and 18 deletions

View File

@@ -206,7 +206,7 @@ void config_exosphere(launch_ctxt_t *ctxt, u32 warmboot_base)
if (!ctxt->stock) if (!ctxt->stock)
{ {
LIST_INIT(ini_exo_sections); LIST_INIT(ini_exo_sections);
if (ini_parse(&ini_exo_sections, "exosphere.ini", false)) if (!ini_parse(&ini_exo_sections, "exosphere.ini", false))
{ {
LIST_FOREACH_ENTRY(ini_sec_t, ini_sec, &ini_exo_sections, link) LIST_FOREACH_ENTRY(ini_sec_t, ini_sec, &ini_exo_sections, link)
{ {
@@ -245,7 +245,7 @@ void config_exosphere(launch_ctxt_t *ctxt, u32 warmboot_base)
if (!ctxt->exo_ctx.usb3_force) if (!ctxt->exo_ctx.usb3_force)
{ {
LIST_INIT(ini_sys_sections); LIST_INIT(ini_sys_sections);
if (ini_parse(&ini_sys_sections, "atmosphere/config/system_settings.ini", false)) if (!ini_parse(&ini_sys_sections, "atmosphere/config/system_settings.ini", false))
{ {
LIST_FOREACH_ENTRY(ini_sec_t, ini_sec, &ini_sys_sections, link) LIST_FOREACH_ENTRY(ini_sec_t, ini_sec, &ini_sys_sections, link)
{ {

View File

@@ -314,7 +314,7 @@ static void _launch_ini_list()
goto parse_failed; goto parse_failed;
// Check that ini files exist and parse them. // Check that ini files exist and parse them.
if (!ini_parse(&ini_list_sections, "bootloader/ini", true)) if (ini_parse(&ini_list_sections, "bootloader/ini", true))
{ {
EPRINTF("No .ini files in bootloader/ini!"); EPRINTF("No .ini files in bootloader/ini!");
goto parse_failed; goto parse_failed;
@@ -752,7 +752,7 @@ static void _auto_launch()
emummc_load_cfg(); emummc_load_cfg();
// Parse hekate main configuration. // Parse hekate main configuration.
if (!ini_parse(&ini_sections, "bootloader/hekate_ipl.ini", false)) if (ini_parse(&ini_sections, "bootloader/hekate_ipl.ini", false))
goto out; // Can't load hekate_ipl.ini. goto out; // Can't load hekate_ipl.ini.
// Load configuration. // Load configuration.
@@ -839,7 +839,7 @@ static void _auto_launch()
boot_entry_id = 1; boot_entry_id = 1;
bootlogoCustomEntry = NULL; bootlogoCustomEntry = NULL;
if (!ini_parse(&ini_list_sections, "bootloader/ini", true)) if (ini_parse(&ini_list_sections, "bootloader/ini", true))
goto skip_list; goto skip_list;
LIST_FOREACH_ENTRY(ini_sec_t, ini_sec_list, &ini_list_sections, link) LIST_FOREACH_ENTRY(ini_sec_t, ini_sec_list, &ini_list_sections, link)

View File

@@ -43,7 +43,7 @@ void emummc_load_cfg()
emu_cfg.emummc_file_based_path[0] = 0; emu_cfg.emummc_file_based_path[0] = 0;
LIST_INIT(ini_sections); LIST_INIT(ini_sections);
if (ini_parse(&ini_sections, "emuMMC/emummc.ini", false)) if (!ini_parse(&ini_sections, "emuMMC/emummc.ini", false))
{ {
LIST_FOREACH_ENTRY(ini_sec_t, ini_sec, &ini_sections, link) LIST_FOREACH_ENTRY(ini_sec_t, ini_sec, &ini_sections, link)
{ {

View File

@@ -65,12 +65,12 @@ int create_config_entry()
{ {
char lbuf[64]; char lbuf[64];
FIL fp; FIL fp;
bool mainIniFound = false; bool ini_found = false;
LIST_INIT(ini_sections); LIST_INIT(ini_sections);
if (ini_parse(&ini_sections, "bootloader/hekate_ipl.ini", false)) if (!ini_parse(&ini_sections, "bootloader/hekate_ipl.ini", false))
mainIniFound = true; ini_found = true;
else else
{ {
u8 res = f_open(&fp, "bootloader/hekate_ipl.ini", FA_READ); u8 res = f_open(&fp, "bootloader/hekate_ipl.ini", FA_READ);
@@ -137,7 +137,7 @@ int create_config_entry()
f_puts("\n", &fp); f_puts("\n", &fp);
if (mainIniFound) if (ini_found)
{ {
// Re-construct existing entries. // Re-construct existing entries.
LIST_FOREACH_ENTRY(ini_sec_t, ini_sec, &ini_sections, link) LIST_FOREACH_ENTRY(ini_sec_t, ini_sec, &ini_sections, link)

View File

@@ -39,7 +39,7 @@ void load_emummc_cfg(emummc_cfg_t *emu_info)
// Parse emuMMC configuration. // Parse emuMMC configuration.
LIST_INIT(ini_sections); LIST_INIT(ini_sections);
if (!ini_parse(&ini_sections, "emuMMC/emummc.ini", false)) if (ini_parse(&ini_sections, "emuMMC/emummc.ini", false))
return; return;
LIST_FOREACH_ENTRY(ini_sec_t, ini_sec, &ini_sections, link) LIST_FOREACH_ENTRY(ini_sec_t, ini_sec, &ini_sections, link)

View File

@@ -1770,15 +1770,15 @@ static lv_res_t _create_window_home_launch(lv_obj_t *btn)
// Choose what to parse. // Choose what to parse.
bool ini_parse_success = false; bool ini_parse_success = false;
if (!more_cfg) if (!more_cfg)
ini_parse_success = ini_parse(&ini_sections, "bootloader/hekate_ipl.ini", false); ini_parse_success = !ini_parse(&ini_sections, "bootloader/hekate_ipl.ini", false);
else else
ini_parse_success = ini_parse(&ini_sections, "bootloader/ini", true); ini_parse_success = !ini_parse(&ini_sections, "bootloader/ini", true);
if (combined_cfg && !ini_parse_success) if (combined_cfg && !ini_parse_success)
{ {
ini_parsing: ini_parsing:
list_init(&ini_sections); list_init(&ini_sections);
ini_parse_success = ini_parse(&ini_sections, "bootloader/ini", true); ini_parse_success = !ini_parse(&ini_sections, "bootloader/ini", true);
more_cfg = true; more_cfg = true;
} }

View File

@@ -228,7 +228,7 @@ static void _create_autoboot_window()
// Parse hekate main configuration. // Parse hekate main configuration.
LIST_INIT(ini_sections); LIST_INIT(ini_sections);
if (ini_parse(&ini_sections, "bootloader/hekate_ipl.ini", false)) if (!ini_parse(&ini_sections, "bootloader/hekate_ipl.ini", false))
{ {
LIST_FOREACH_ENTRY(ini_sec_t, ini_sec, &ini_sections, link) LIST_FOREACH_ENTRY(ini_sec_t, ini_sec, &ini_sections, link)
{ {
@@ -272,7 +272,7 @@ static void _create_autoboot_window()
// Parse all .ini files in ini folder. // Parse all .ini files in ini folder.
LIST_INIT(ini_list_sections); LIST_INIT(ini_list_sections);
if (ini_parse(&ini_list_sections, "bootloader/ini", true)) if (!ini_parse(&ini_list_sections, "bootloader/ini", true))
{ {
LIST_FOREACH_ENTRY(ini_sec_t, ini_sec, &ini_list_sections, link) LIST_FOREACH_ENTRY(ini_sec_t, ini_sec, &ini_list_sections, link)
{ {

View File

@@ -167,7 +167,7 @@ static void _load_saved_configuration()
LIST_INIT(ini_sections); LIST_INIT(ini_sections);
LIST_INIT(ini_nyx_sections); LIST_INIT(ini_nyx_sections);
if (!ini_parse(&ini_sections, "bootloader/hekate_ipl.ini", false)) if (ini_parse(&ini_sections, "bootloader/hekate_ipl.ini", false))
{ {
create_config_entry(); create_config_entry();
goto skip_main_cfg_parse; goto skip_main_cfg_parse;
@@ -212,7 +212,7 @@ static void _load_saved_configuration()
ini_free(&ini_sections); ini_free(&ini_sections);
skip_main_cfg_parse: skip_main_cfg_parse:
if (!ini_parse(&ini_nyx_sections, "bootloader/nyx.ini", false)) if (ini_parse(&ini_nyx_sections, "bootloader/nyx.ini", false))
return; return;
// Load Nyx configuration. // Load Nyx configuration.