mirrors/limine
1
0
Fork 0
mirror of https://github.com/limine-bootloader/limine synced 2025-01-22 04:22:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

menu: Do not have countdown if default entry is a directory

Browse Source
This commit is contained in:
mintsuki 2020-12-02 19:16:38 +01:00
parent 75c51c1e53
commit fe022c49f5
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
limine-pxe.bin
View File

Binary file not shown.

BIN
limine.bin
View File

Binary file not shown.

BIN
stage2.map
View File

Binary file not shown.

8
stage2/menu.c
View File

@ -239,6 +239,7 @@ static int print_tree(int level, int base_index, int selected_entry,
} }
char *menu(char **cmdline) { char *menu(char **cmdline) {
bool skip_timeout = false;
struct menu_entry *selected_menu_entry; struct menu_entry *selected_menu_entry;
int selected_entry = 0; int selected_entry = 0;
@ -319,7 +320,6 @@ char *menu(char **cmdline) {
} }
disable_cursor(); disable_cursor();
bool skip_timeout = false;
if (menu_tree == NULL) if (menu_tree == NULL)
panic("Config contains no entries."); panic("Config contains no entries.");
@ -335,7 +335,10 @@ refresh:
int max_entries = print_tree(0, 0, selected_entry, menu_tree, int max_entries = print_tree(0, 0, selected_entry, menu_tree,
&selected_menu_entry); &selected_menu_entry);
print("\nArrows to choose, enter to select, 'e' to edit selected entry."); print("\nArrows to choose, enter to boot, 'e' to edit selected entry.");
if (selected_menu_entry->sub != NULL)
skip_timeout = true;
int c; int c;
@ -370,7 +373,6 @@ timeout_aborted:
case '\r': case '\r':
autoboot: autoboot:
if (selected_menu_entry->sub != NULL) { if (selected_menu_entry->sub != NULL) {
skip_timeout = true;
selected_menu_entry->expanded = !selected_menu_entry->expanded; selected_menu_entry->expanded = !selected_menu_entry->expanded;
goto refresh; goto refresh;
} }

2
test/limine.cfg
View File

@ -1,4 +1,4 @@
DEFAULT_ENTRY=0 DEFAULT_ENTRY=1
TIMEOUT=3 TIMEOUT=3
GRAPHICS=yes GRAPHICS=yes
MENU_RESOLUTION=1024x768 MENU_RESOLUTION=1024x768