When question not have storage with it, not restore old value for it.

Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13710 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index a15cc828cb998440670d6bbf9c0ce5879e485c94..ed7f015d663eb454fe7d6f332b9d85bb64def07c 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -3654,6 +3654,11 @@ InitializeCurrentSetting (
   FORM_BROWSER_FORM       *Form2;\r
   EFI_STATUS              Status;\r
 \r
+  //\r
+  // Extract default from IFR binary for no storage questions.\r
+  //  \r
+  ExtractDefault (FormSet, NULL, EFI_HII_DEFAULT_CLASS_STANDARD, FormSetLevel, GetDefaultForNoStorage, NULL, TRUE);\r
+\r
   //\r
   // Request current settings from Configuration Driver\r
   //\r
@@ -3716,11 +3721,6 @@ InitializeCurrentSetting (
   // If has old formset, get the old nv update status.\r
   //\r
   if (gOldFormSet != NULL) {\r
-    //\r
-    // Restore question value for questions without storage.\r
-    //\r
-    CopyOldValueForNoStorageQst (FormSet, gOldFormSet);\r
-\r
     Link = GetFirstNode (&FormSet->FormListHead);\r
     while (!IsNull (&FormSet->FormListHead, Link)) {\r
       Form = FORM_BROWSER_FORM_FROM_LINK (Link);\r
@@ -3738,11 +3738,6 @@ InitializeCurrentSetting (
       }\r
       Link = GetNextNode (&FormSet->FormListHead, Link);\r
     }\r
-  } else {\r
-    //\r
-    // Extract default from IFR binary for no storage questions.\r
-    //  \r
-    ExtractDefault (FormSet, NULL, EFI_HII_DEFAULT_CLASS_STANDARD, FormSetLevel, GetDefaultForNoStorage, NULL, TRUE);\r
   }\r
 \r
   return EFI_SUCCESS;\r