mirror of
https://github.com/reactos/reactos.git
synced 2024-12-27 09:34:43 +00:00
[FREELDR] Don't popup about deprecated features in auto-boot scenario (#6803)
Addendum to commit 5f3554a40
.
This commit is contained in:
parent
7bee32d237
commit
565a4b359a
1 changed files with 9 additions and 2 deletions
|
@ -84,6 +84,10 @@ WarnDeprecated(
|
|||
va_list ap;
|
||||
CHAR msgString[300];
|
||||
|
||||
/* If the user didn't cancel the timeout, don't display the warning */
|
||||
if (BootMgrInfo.TimeOut >= 0)
|
||||
return;
|
||||
|
||||
va_start(ap, MsgFmt);
|
||||
RtlStringCbVPrintfA(msgString, sizeof(msgString),
|
||||
MsgFmt, ap);
|
||||
|
@ -328,6 +332,9 @@ MainBootMenuKeyPressFilter(
|
|||
IN ULONG SelectedMenuItem,
|
||||
IN PVOID Context OPTIONAL)
|
||||
{
|
||||
/* Any key-press cancels the global timeout */
|
||||
BootMgrInfo.TimeOut = -1;
|
||||
|
||||
switch (KeyPress)
|
||||
{
|
||||
case KEY_F8:
|
||||
|
@ -445,11 +452,11 @@ VOID RunLoader(VOID)
|
|||
goto Reboot;
|
||||
}
|
||||
|
||||
BootMgrInfo.TimeOut = -1;
|
||||
|
||||
/* Load the chosen operating system */
|
||||
LoadOperatingSystem(&OperatingSystemList[SelectedOperatingSystem]);
|
||||
|
||||
BootMgrInfo.TimeOut = -1;
|
||||
|
||||
/* If we get there, the OS loader failed. As it may have
|
||||
* messed up the display, re-initialize the UI. */
|
||||
#ifndef _M_ARM
|
||||
|
|
Loading…
Reference in a new issue