Fixed system hang issue with accessing to Boot Maintenance Manager

[mirror_edk2.git] / Vlv2TbltDevicePkg / Library / PlatformBdsLib / BdsPlatform.c

diff --git a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
index b0ada79f0296da04b720474db22e236334e07c3e..e7e4a919253304b0a970ebfe4ecd97f51bf07841 100644 (file)
--- a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
+++ b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
@@ -2051,7 +2051,11 @@ PlatformBdsEnterFrontPageWithHotKey (
       goto Exit;\r
     }\r
   }\r
-\r
+  //\r
+  // Install BM HiiPackages. \r
+  // Keep BootMaint HiiPackage, so that it can be covered by global setting. \r
+  //\r
+       InitBMPackage ();\r
   do {\r
 \r
     BdsSetConsoleMode (TRUE);\r
@@ -2113,11 +2117,20 @@ PlatformBdsEnterFrontPageWithHotKey (
       break;\r
 \r
     case FRONT_PAGE_KEY_BOOT_MANAGER:\r
+      //\r
+         // Remove the installed BootMaint HiiPackages when exit.\r
+      //\r
+      FreeBMPackage ();\r
 \r
       //\r
       // User chose to run the Boot Manager\r
       //\r
       CallBootManager ();\r
+         \r
+         //\r
+      // Reinstall BootMaint HiiPackages after exiting from Boot Manager.\r
+      //\r
+      InitBMPackage ();\r
       break;\r
 \r
     case FRONT_PAGE_KEY_DEVICE_MANAGER:\r
@@ -2145,6 +2158,10 @@ PlatformBdsEnterFrontPageWithHotKey (
   //Will leave browser, check any reset required change is applied? if yes, reset system\r
   //\r
   SetupResetReminder ();\r
+  //\r
+  // Remove the installed BootMaint HiiPackages when exit.\r
+  //\r
+  FreeBMPackage ();\r
 \r
 Exit:\r
   //\r