|
 |
31004e6 |
From 0053990e0ed35bc3f438628a5b6b5aa6134b2d4b Mon Sep 17 00:00:00 2001
|
|
|
31004e6 |
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
|
|
31004e6 |
Date: Sat, 4 May 2013 13:43:07 +0200
|
|
|
f74b50e |
Subject: [PATCH 417/482] * grub-core/normal/menu.c (run_menu): Fix
|
|
|
31004e6 |
timeout reference point.
|
|
|
31004e6 |
|
|
|
31004e6 |
---
|
|
|
31004e6 |
ChangeLog | 4 ++++
|
|
|
31004e6 |
grub-core/normal/menu.c | 6 +++---
|
|
|
31004e6 |
2 files changed, 7 insertions(+), 3 deletions(-)
|
|
|
31004e6 |
|
|
|
31004e6 |
diff --git a/ChangeLog b/ChangeLog
|
|
|
31004e6 |
index e0576e5..6b0576d 100644
|
|
|
31004e6 |
--- a/ChangeLog
|
|
|
31004e6 |
+++ b/ChangeLog
|
|
|
31004e6 |
@@ -1,5 +1,9 @@
|
|
|
31004e6 |
2013-05-04 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
31004e6 |
|
|
|
31004e6 |
+ * grub-core/normal/menu.c (run_menu): Fix timeout reference point.
|
|
|
31004e6 |
+
|
|
|
31004e6 |
+2013-05-04 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
31004e6 |
+
|
|
|
31004e6 |
* grub-core/gettext/gettext.c: Try $lang.gmo as well.
|
|
|
31004e6 |
|
|
|
31004e6 |
2013-05-04 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
31004e6 |
diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
|
|
|
31004e6 |
index 787b287..fba19db 100644
|
|
|
31004e6 |
--- a/grub-core/normal/menu.c
|
|
|
31004e6 |
+++ b/grub-core/normal/menu.c
|
|
|
31004e6 |
@@ -519,12 +519,12 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
|
|
|
31004e6 |
|
|
|
31004e6 |
current_entry = default_entry;
|
|
|
31004e6 |
|
|
|
31004e6 |
- /* Initialize the time. */
|
|
|
31004e6 |
- saved_time = grub_get_time_ms ();
|
|
|
31004e6 |
-
|
|
|
31004e6 |
refresh:
|
|
|
31004e6 |
menu_init (current_entry, menu, nested);
|
|
|
31004e6 |
|
|
|
31004e6 |
+ /* Initialize the time. */
|
|
|
31004e6 |
+ saved_time = grub_get_time_ms ();
|
|
|
31004e6 |
+
|
|
|
31004e6 |
timeout = grub_menu_get_timeout ();
|
|
|
31004e6 |
|
|
|
31004e6 |
if (timeout > 0)
|
|
|
31004e6 |
--
|
|
|
31004e6 |
1.8.2.1
|
|
|
31004e6 |
|