vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Replace grub_checkkey with grub_getkey_noblock.

Browse source 
* grub-core/kern/term.c (grub_checkkey): Replaced with ...
	(grub_getkey_noblock): ... this. All users updated.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-18 19:59:01 +01:00
parent b500bcfeed
commit a8f16eab1a
7 changed files with 28 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

14
grub-core/normal/menu.c
View file

@ -52,12 +52,8 @@ grub_wait_after_message (void)
endtime = grub_get_time_ms () + 10000;
while (grub_get_time_ms () < endtime)
if (grub_checkkey () >= 0)
{
grub_getkey ();
break;
}
while (grub_get_time_ms () < endtime
&& grub_getkey_noblock () == GRUB_TERM_NO_KEY);
grub_xputs ("\n");
}
@ -560,10 +556,10 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
return default_entry;
}
if (grub_checkkey () >= 0 || timeout < 0)
{
c = grub_getkey ();
c = grub_getkey_noblock ();
if (c != GRUB_TERM_NO_KEY)
{
if (timeout >= 0)
{
grub_env_unset ("timeout");