diff --git a/bootloader/hos/secmon_exo.c b/bootloader/hos/secmon_exo.c index 80ae1ba2..e5686a09 100644 --- a/bootloader/hos/secmon_exo.c +++ b/bootloader/hos/secmon_exo.c @@ -206,7 +206,7 @@ void config_exosphere(launch_ctxt_t *ctxt, u32 warmboot_base) if (!ctxt->stock) { 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) { @@ -245,7 +245,7 @@ void config_exosphere(launch_ctxt_t *ctxt, u32 warmboot_base) if (!ctxt->exo_ctx.usb3_force) { 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) { diff --git a/bootloader/main.c b/bootloader/main.c index b4e9f98c..f7c29ba4 100644 --- a/bootloader/main.c +++ b/bootloader/main.c @@ -314,7 +314,7 @@ static void _launch_ini_list() goto parse_failed; // 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!"); goto parse_failed; @@ -752,7 +752,7 @@ static void _auto_launch() emummc_load_cfg(); // 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. // Load configuration. @@ -839,7 +839,7 @@ static void _auto_launch() boot_entry_id = 1; bootlogoCustomEntry = NULL; - if (!ini_parse(&ini_list_sections, "bootloader/ini", true)) + if (ini_parse(&ini_list_sections, "bootloader/ini", true)) goto skip_list; LIST_FOREACH_ENTRY(ini_sec_t, ini_sec_list, &ini_list_sections, link) diff --git a/bootloader/storage/emummc.c b/bootloader/storage/emummc.c index 82072441..d61b7550 100644 --- a/bootloader/storage/emummc.c +++ b/bootloader/storage/emummc.c @@ -43,7 +43,7 @@ void emummc_load_cfg() emu_cfg.emummc_file_based_path[0] = 0; 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) { diff --git a/nyx/nyx_gui/config.c b/nyx/nyx_gui/config.c index 3474350b..f3e5c892 100644 --- a/nyx/nyx_gui/config.c +++ b/nyx/nyx_gui/config.c @@ -65,12 +65,12 @@ int create_config_entry() { char lbuf[64]; FIL fp; - bool mainIniFound = false; + bool ini_found = false; LIST_INIT(ini_sections); - if (ini_parse(&ini_sections, "bootloader/hekate_ipl.ini", false)) - mainIniFound = true; + if (!ini_parse(&ini_sections, "bootloader/hekate_ipl.ini", false)) + ini_found = true; else { u8 res = f_open(&fp, "bootloader/hekate_ipl.ini", FA_READ); @@ -137,7 +137,7 @@ int create_config_entry() f_puts("\n", &fp); - if (mainIniFound) + if (ini_found) { // Re-construct existing entries. LIST_FOREACH_ENTRY(ini_sec_t, ini_sec, &ini_sections, link) diff --git a/nyx/nyx_gui/frontend/fe_emummc_tools.c b/nyx/nyx_gui/frontend/fe_emummc_tools.c index 24f07c14..3a1dc542 100644 --- a/nyx/nyx_gui/frontend/fe_emummc_tools.c +++ b/nyx/nyx_gui/frontend/fe_emummc_tools.c @@ -39,7 +39,7 @@ void load_emummc_cfg(emummc_cfg_t *emu_info) // Parse emuMMC configuration. LIST_INIT(ini_sections); - if (!ini_parse(&ini_sections, "emuMMC/emummc.ini", false)) + if (ini_parse(&ini_sections, "emuMMC/emummc.ini", false)) return; LIST_FOREACH_ENTRY(ini_sec_t, ini_sec, &ini_sections, link) diff --git a/nyx/nyx_gui/frontend/gui.c b/nyx/nyx_gui/frontend/gui.c index 25ab5daa..acd5a075 100644 --- a/nyx/nyx_gui/frontend/gui.c +++ b/nyx/nyx_gui/frontend/gui.c @@ -1770,15 +1770,15 @@ static lv_res_t _create_window_home_launch(lv_obj_t *btn) // Choose what to parse. bool ini_parse_success = false; 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 - 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) { ini_parsing: 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; } diff --git a/nyx/nyx_gui/frontend/gui_options.c b/nyx/nyx_gui/frontend/gui_options.c index 578e5b6b..0ab730dc 100644 --- a/nyx/nyx_gui/frontend/gui_options.c +++ b/nyx/nyx_gui/frontend/gui_options.c @@ -228,7 +228,7 @@ static void _create_autoboot_window() // Parse hekate main configuration. 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) { @@ -272,7 +272,7 @@ static void _create_autoboot_window() // Parse all .ini files in ini folder. 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) { diff --git a/nyx/nyx_gui/nyx.c b/nyx/nyx_gui/nyx.c index 1c5bfe04..c3c29255 100644 --- a/nyx/nyx_gui/nyx.c +++ b/nyx/nyx_gui/nyx.c @@ -167,7 +167,7 @@ static void _load_saved_configuration() LIST_INIT(ini_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(); goto skip_main_cfg_parse; @@ -212,7 +212,7 @@ static void _load_saved_configuration() ini_free(&ini_sections); 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; // Load Nyx configuration.