nold/hekate
1
0
Fork 0
mirror of https://github.com/CTCaer/hekate synced 2024-07-06 16:33:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix return to main when setting an autoboot option

Browse source 
This fixes the issue with "More configs".
This commit is contained in:
Kostas Missos 2018-12-16 20:21:59 +02:00
parent 98d715243a
commit 9f5b97620a
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
bootloader/config/config.c
View file

@ -156,7 +156,7 @@ int create_config_entry()
return 0; return 0;
} }
void _config_autoboot_list() static void _config_autoboot_list(void *ent)
{ {
gfx_clear_grey(&gfx_ctxt, 0x1B); gfx_clear_grey(&gfx_ctxt, 0x1B);
gfx_con_setpos(&gfx_con, 0, 0); gfx_con_setpos(&gfx_con, 0, 0);
@ -231,6 +231,9 @@ void _config_autoboot_list()
else else
EPRINTF("\nConfiguration saving failed!"); EPRINTF("\nConfiguration saving failed!");
gfx_puts(&gfx_con, "\nPress any key..."); gfx_puts(&gfx_con, "\nPress any key...");
ment_t *tmp = (ment_t *)ent;
tmp->data = NULL;
} }
else else
goto out2; goto out2;
@ -251,9 +254,6 @@ out2:;
ini_free(&ini_sections); ini_free(&ini_sections);
sd_unmount(); sd_unmount();
if (temp_autoboot == NULL)
return;
} }
void config_autoboot() void config_autoboot()
@ -291,13 +291,13 @@ void config_autoboot()
ments[2].caption = " Disable"; ments[2].caption = " Disable";
ments[2].data = &boot_values[0]; ments[2].data = &boot_values[0];
ments[3].type = MENT_HANDLER; ments[3].type = MENT_HDLR_RE;
if (h_cfg.autoboot_list) if (h_cfg.autoboot_list)
ments[3].caption = "*More configs..."; ments[3].caption = "*More configs...";
else else
ments[3].caption = " More configs..."; ments[3].caption = " More configs...";
ments[3].handler = _config_autoboot_list; ments[3].handler = _config_autoboot_list;
ments[3].data = NULL; ments[3].data = (void *)0xCAFE;
ments[4].type = MENT_CHGLINE; ments[4].type = MENT_CHGLINE;

1
bootloader/frontend/fe_tools.c
View file

@ -322,6 +322,7 @@ void menu_autorcm()
ments[4].handler = _disable_autorcm; ments[4].handler = _disable_autorcm;
} }
ments[4].type = MENT_HDLR_RE; ments[4].type = MENT_HDLR_RE;
ments[4].data = NULL;
memset(&ments[5], 0, sizeof(ment_t)); memset(&ments[5], 0, sizeof(ment_t));
menu_t menu = {ments, "This corrupts your BOOT0!", 0, 0}; menu_t menu = {ments, "This corrupts your BOOT0!", 0, 0};

6
bootloader/gfx/tui.c
View file

@ -206,8 +206,10 @@ void *tui_do_menu(gfx_con_t *con, menu_t *menu)
return NULL; return NULL;
break; break;
case MENT_HDLR_RE: case MENT_HDLR_RE:
ent->handler(ent->data); ent->handler(ent);
return NULL; if (!ent->data)
return NULL;
break;
default: default:
break; break;
} }