Aren/rulimine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

menu: Fix panic menu-reentry with TIMEOUT=0; fix entry assembly

Browse Source
This commit is contained in:
mintsuki 2021-12-11 20:28:16 +01:00
parent edad956e9a
commit d021d6ff12
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stage23/menu.c
View File

@ -543,7 +543,7 @@ void menu(__attribute__((unused)) bool timeout_enabled) {
"mov %esp, (%eax)\n\t"
"jmp 3f\n\t"
"1:\n\t"
"mov 4(%esp), %edi\n\t"
"mov (%esp), %edi\n\t"
"mov (%eax), %esp\n\t"
"push %edi\n\t"
"jmp 3f\n\t"
@ -651,7 +651,7 @@ static void _menu(bool timeout_enabled) {
char *editor_enabled_config = config_get_value(NULL, 0, "EDITOR_ENABLED");
if (!strcmp(editor_enabled_config, "no")) editor_enabled = false;
if (!timeout) {
if (!skip_timeout && !timeout) {
// Use print tree to load up selected_menu_entry and determine if the
// default entry is valid.
print_tree(NULL, 0, 0, selected_entry, menu_tree, &selected_menu_entry);