aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2007-07-24 17:15:07 -0700
committerH. Peter Anvin <hpa@zytor.com>2007-07-24 17:15:07 -0700
commitdc80d0a4c558ef6f30e943154abeb49e8026848e (patch)
treeab3ca52f65f168ecde85b6dbb15d90d98a354ed7
parentacd8349fe05dd9a7301c47994f5ed466127a192d (diff)
downloadsyslinux-dc80d0a4c558ef6f30e943154abeb49e8026848e.tar.gz
syslinux-dc80d0a4c558ef6f30e943154abeb49e8026848e.tar.xz
syslinux-dc80d0a4c558ef6f30e943154abeb49e8026848e.zip
Make the hidden timeout behaviour match the rest of the menu
-rw-r--r--com32/modules/menumain.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/com32/modules/menumain.c b/com32/modules/menumain.c
index 42826462..73082f7a 100644
--- a/com32/modules/menumain.c
+++ b/com32/modules/menumain.c
@@ -793,6 +793,9 @@ run_menu(void)
const char *cmdline = NULL;
volatile clock_t key_timeout, timeout_left, this_timeout;
+ /* Note: for both key_timeout and timeout == 0 means no limit */
+ timeout_left = key_timeout = timeout;
+
/* If we're in shiftkey mode, exit immediately unless a shift key is pressed */
if ( shiftkey && !shift_is_held() ) {
return menu_entries[defentry].cmdline;
@@ -807,12 +810,9 @@ run_menu(void)
/* Otherwise display the menu now; the timeout has already been
cancelled, since the user pressed a key. */
hiddenmenu = 0;
- timeout = 0;
+ key_timeout = 0;
}
- /* Note: for both key_timeout and timeout == 0 means no limit */
- timeout_left = key_timeout = timeout;
-
/* Handle both local and global timeout */
if ( setjmp(timeout_jump) ) {
entry = defentry;