a5bd9f6
From 55073b6febd54c1dfe6366f9e8a4d945d1eb70ca Mon Sep 17 00:00:00 2001
a5bd9f6
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
a5bd9f6
Date: Mon, 25 Mar 2013 10:32:06 +0100
a5bd9f6
Subject: [PATCH 232/364] 	* grub-core/normal/menu.c: Wait if there were
a5bd9f6
 errors shown at "boot" 	command.
a5bd9f6
a5bd9f6
---
a5bd9f6
 ChangeLog               | 5 +++++
a5bd9f6
 grub-core/normal/menu.c | 5 +++++
a5bd9f6
 2 files changed, 10 insertions(+)
a5bd9f6
a5bd9f6
diff --git a/ChangeLog b/ChangeLog
a5bd9f6
index 8425aff..5ca62d0 100644
a5bd9f6
--- a/ChangeLog
a5bd9f6
+++ b/ChangeLog
a5bd9f6
@@ -1,5 +1,10 @@
a5bd9f6
 2013-03-25  Vladimir Serbinenko  <phcoder@gmail.com>
a5bd9f6
 
a5bd9f6
+	* grub-core/normal/menu.c: Wait if there were errors shown at "boot"
a5bd9f6
+	command.
a5bd9f6
+
a5bd9f6
+2013-03-25  Vladimir Serbinenko  <phcoder@gmail.com>
a5bd9f6
+
a5bd9f6
 	Replace the region at 0 from coreboot tables to available in BSD
a5bd9f6
 	memory map.
a5bd9f6
 
a5bd9f6
diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
a5bd9f6
index 7e0a158..787b287 100644
a5bd9f6
--- a/grub-core/normal/menu.c
a5bd9f6
+++ b/grub-core/normal/menu.c
a5bd9f6
@@ -250,10 +250,15 @@ grub_menu_execute_entry(grub_menu_entry_t entry, int auto_boot)
a5bd9f6
   if (errs_before != grub_err_printed_errors)
a5bd9f6
     grub_wait_after_message ();
a5bd9f6
 
a5bd9f6
+  errs_before = grub_err_printed_errors;
a5bd9f6
+
a5bd9f6
   if (grub_errno == GRUB_ERR_NONE && grub_loader_is_loaded ())
a5bd9f6
     /* Implicit execution of boot, only if something is loaded.  */
a5bd9f6
     grub_command_execute ("boot", 0, 0);
a5bd9f6
 
a5bd9f6
+  if (errs_before != grub_err_printed_errors)
a5bd9f6
+    grub_wait_after_message ();
a5bd9f6
+
a5bd9f6
   if (entry->submenu)
a5bd9f6
     {
a5bd9f6
       if (menu && menu->size)
a5bd9f6
-- 
a5bd9f6
1.8.1.4
a5bd9f6