From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 23 Aug 2010 11:12:29 +0000 (+0200)
Subject: Fix bugs in grub_getkey introduced in previous commit
X-Git-Tag: 1.99~488^2~13
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=071b673a7b50b59754841cf1c1f888c51d0a670e;p=thirdparty%2Fgrub.git

Fix bugs in grub_getkey introduced in previous commit
---

diff --git a/kern/term.c b/kern/term.c
index 9d23b4f91..7b3593161 100644
--- a/kern/term.c
+++ b/kern/term.c
@@ -104,15 +104,19 @@ grub_checkkey (void)
 int
 grub_getkey (void)
 {
+  int ret;
+
   grub_refresh ();
 
-  while (pending_key != GRUB_TERM_NO_KEY)
+  grub_checkkey ();
+  while (pending_key == GRUB_TERM_NO_KEY)
     {
       grub_cpu_idle ();
       grub_checkkey ();
     }
+  ret = pending_key;
   pending_key = GRUB_TERM_NO_KEY;
-  return pending_key;
+  return ret;
 }