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>

diff --git a/NEWS b/NEWS
index 70563f7..bdc46cb 100644 (file)
--- 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 81780ea..e5b6eb9 100644 (file)
--- 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 */
 }