From: robertmh <robertmh@localhost>
Date: Sat, 2 Feb 2008 16:48:52 +0000 (+0000)
Subject: 2008-02-02  Robert Millan  <rmh@aybabtu.com>
X-Git-Tag: 1.98~1646
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e03a11328eee624734a80769ed01d9e4bfa123dc;p=thirdparty%2Fgrub.git

2008-02-02  Robert Millan  <rmh@aybabtu.com>

        * normal/main.c (grub_normal_execute): Check for `menu->size' when
        determining whether menu has to be displayed.
---

diff --git a/ChangeLog b/ChangeLog
index 7be624ced..d345ad8a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-02  Robert Millan  <rmh@aybabtu.com>
+
+	* normal/main.c (grub_normal_execute): Check for `menu->size' when
+	determining whether menu has to be displayed.
+
 2008-02-02  Marco Gerards  <marco@gnu.org>
 
 	* bus/pci.c: New file.
diff --git a/normal/main.c b/normal/main.c
index 5fb3fa007..e5458fc98 100644
--- a/normal/main.c
+++ b/normal/main.c
@@ -474,7 +474,7 @@ grub_normal_execute (const char *config, int nested)
       grub_errno = GRUB_ERR_NONE;
     }
 
-  if (menu)
+  if (menu && menu->size)
     {
       grub_menu_run (menu, nested);
       if (nested)