MyFavMirrors
/
Ventoy
mirror of https://github.com/ventoy/Ventoy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a bug that menu_tip is not shown for the default menu item.

This commit is contained in:
longpanda 2021-10-12 16:02:25 +08:00
parent 67b8a34e8c
commit 9351fe4f97
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
GRUB2/MOD_SRC/grub-2.04/grub-core/normal/menu.c
View File

@ -389,23 +389,29 @@ int g_ventoy_tip_label_enable = 0;
const char * g_ventoy_tip_msg1 = NULL; const char * g_ventoy_tip_msg1 = NULL;
const char * g_ventoy_tip_msg2 = NULL; const char * g_ventoy_tip_msg2 = NULL;
static void menu_set_chosen_tip(grub_menu_t menu, int entry)
{
img_info *img;
grub_menu_entry_t e = grub_menu_get_entry (menu, entry);
g_ventoy_tip_msg1 = g_ventoy_tip_msg2 = NULL;
if (e && e->id && grub_strncmp(e->id, "VID_", 4) == 0)
{
img = (img_info *)(void *)grub_strtoul(e->id + 4, NULL, 16);
if (img)
{
g_ventoy_tip_msg1 = img->tip1;
g_ventoy_tip_msg2 = img->tip2;
}
}
}
static void static void
menu_set_chosen_entry (grub_menu_t menu, int entry) menu_set_chosen_entry (grub_menu_t menu, int entry)
{ {
struct grub_menu_viewer *cur; struct grub_menu_viewer *cur;
img_info *img;
grub_menu_entry_t e = grub_menu_get_entry (menu, entry); menu_set_chosen_tip(menu, entry);
g_ventoy_tip_msg1 = g_ventoy_tip_msg2 = NULL;
if (e && e->id && grub_strncmp(e->id, "VID_", 4) == 0) {
img = (img_info *)(void *)grub_strtoul(e->id + 4, NULL, 16);
if (img)
{
g_ventoy_tip_msg1 = img->tip1;
g_ventoy_tip_msg2 = img->tip2;
}
}
for (cur = viewers; cur; cur = cur->next) for (cur = viewers; cur; cur = cur->next)
cur->set_chosen_entry (entry, cur->data); cur->set_chosen_entry (entry, cur->data);
} }
@ -701,6 +707,7 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
current_entry = default_entry; current_entry = default_entry;
refresh: refresh:
menu_set_chosen_tip(menu, current_entry);
menu_init (current_entry, menu, nested); menu_init (current_entry, menu, nested);
/* Initialize the time. */ /* Initialize the time. */