aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergey Vlasov <vsu@altlinux.ru>2009-06-04 19:14:48 +0400
committerH. Peter Anvin <hpa@zytor.com>2009-06-04 09:38:37 -0700
commited6f352b62233c155abf446f57d2b9dc7a6b1e87 (patch)
treebd3a75dee12ec3b6bca78bfd727a6325b0f542f4
parentba03136d0d40bf219b4923855a3a2b20c03babd7 (diff)
downloadsyslinux-elf-ed6f352b62233c155abf446f57d2b9dc7a6b1e87.tar.gz
syslinux-elf-ed6f352b62233c155abf446f57d2b9dc7a6b1e87.tar.xz
syslinux-elf-ed6f352b62233c155abf446f57d2b9dc7a6b1e87.zip
simple menu: make ONTIMEOUT work with MENU HIDDEN
The command invoked when no keys were pressed for the specified time (ONTIMEOUT) may be different from the menu item initially selected when the menu is displayed (DEFAULT or MENU DEFAULT). Unfortunately, this did not work together with MENU HIDDEN (which is exactly the case when having a separate ONTIMEOUT command makes the most sense). Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r--NEWS1
-rw-r--r--com32/menu/menumain.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 70563f72..bdc46cbc 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ Changes in 3.82:
* ISOLINUX: deal with systems which return from INT 13h with
interrupts disabled.
* Do not invoke the idle handler during large file loads.
+ * Simple menu: make ONTIMEOUT work with MENU HIDDEN.
Changes in 3.81:
* Shuffler: fix bug in real-mode entry. This affected a
diff --git a/com32/menu/menumain.c b/com32/menu/menumain.c
index 81780eac..e5b6eb90 100644
--- a/com32/menu/menumain.c
+++ b/com32/menu/menumain.c
@@ -700,6 +700,8 @@ do_hidden_menu(void)
}
}
+ if (cm->ontimeout)
+ return cm->ontimeout;
return cm->menu_entries[cm->defentry]->cmdline; /* Default entry */
}