From 7bc5ca171e0c68f6da7e36d633dbd3d83caa37ec Mon Sep 17 00:00:00 2001
From: qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Tue, 2 Sep 2008 02:15:59 +0000
Subject: [PATCH] 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
---
 MdeModulePkg/Universal/BdsDxe/FrontPage.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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