Merged in the bug fixes from EDK I.

*** Press F9 in Uefi64 FrontPage shouldnot enter sub-menu
** [FT] Some UI error on multiple platforms on framework_20080811
** [FT] UI test of How tall are you(Hex) on framework_20080811

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5773 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/BdsDxe/FrontPage.c b/MdeModulePkg/Universal/BdsDxe/FrontPage.c
index 46355fabd7928922c54680a9f1627ff9b2a6f9a8..914f177ed6d725c165a0787e101cc5bcb975546c 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/FrontPage.c
+++ b/MdeModulePkg/Universal/BdsDxe/FrontPage.c
@@ -887,12 +887,16 @@ PlatformBdsEnterFrontPage (
     Status = ShowProgress (TimeoutDefault);\r
     gBS->RaiseTPL (TPL_APPLICATION);\r
 \r
+    //\r
+    // Ensure screen is clear when switch Console from Graphics mode to Text mode\r
+    //\r
+    gST->ConOut->EnableCursor (gST->ConOut, TRUE);\r
+    gST->ConOut->ClearScreen (gST->ConOut);\r
+\r
     if (EFI_ERROR (Status)) {\r
       //\r
       // Timeout or user press enter to continue\r
       //\r
-      gST->ConOut->EnableCursor (gST->ConOut, TRUE);\r
-      gST->ConOut->ClearScreen (gST->ConOut);\r
       goto Exit;\r
     }\r
   }\r