MdeModulePkg: Sets the Cursor to selected BootOption.

[mirror_edk2.git] / MdeModulePkg / Application / BootManagerMenuApp / BootManagerMenu.c

diff --git a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.c b/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.c
index 34d4089a553a57306e8396c7ba49a42d406cd18f..9e729074ece8152d86f3cd5008a4ddf745879637 100644 (file)
--- a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.c
+++ b/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.c
@@ -450,21 +450,11 @@ BootMenuSelectItem (
     RePaintItems = TRUE;\r
   }\r
 \r
-  //\r
-  // Print want to select item\r
-  //\r
-  FirstItem = BootMenuData->ScrollBarControl.FirstItem;\r
-  gST->ConOut->SetAttribute (gST->ConOut, EFI_WHITE | EFI_BACKGROUND_BLACK);\r
-  String = HiiGetString (gStringPackHandle, BootMenuData->PtrTokens[WantSelectItem], NULL);\r
-  PrintCol = StartCol  + 1;\r
-  PrintRow = StartRow + TITLE_TOKEN_COUNT + 2 + WantSelectItem - FirstItem;\r
-  PrintStringAt (PrintCol, PrintRow, String);\r
-  FreePool (String);\r
-\r
   //\r
   // if Want Select and selected item isn't the same and doesn't re-draw selectable\r
   // items, clear select item\r
   //\r
+  FirstItem = BootMenuData->ScrollBarControl.FirstItem;\r
   if (WantSelectItem != BootMenuData->SelectItem && !RePaintItems) {\r
     gST->ConOut->SetAttribute (gST->ConOut, EFI_WHITE | EFI_BACKGROUND_BLUE);\r
     String = HiiGetString (gStringPackHandle, BootMenuData->PtrTokens[BootMenuData->SelectItem], NULL);\r
@@ -474,6 +464,16 @@ BootMenuSelectItem (
     FreePool (String);\r
   }\r
 \r
+  //\r
+  // Print want to select item\r
+  //\r
+  gST->ConOut->SetAttribute (gST->ConOut, EFI_WHITE | EFI_BACKGROUND_BLACK);\r
+  String = HiiGetString (gStringPackHandle, BootMenuData->PtrTokens[WantSelectItem], NULL);\r
+  PrintCol = StartCol  + 1;\r
+  PrintRow = StartRow + TITLE_TOKEN_COUNT + 2 + WantSelectItem - FirstItem;\r
+  PrintStringAt (PrintCol, PrintRow, String);\r
+  FreePool (String);\r
+\r
   gST->ConOut->SetAttribute (gST->ConOut, SavedAttribute);\r
   BootMenuData->SelectItem = WantSelectItem;\r
   return EFI_SUCCESS;\r