From 1deb5cabe54d1177b207b0ed4b64d7819f0657b7 Mon Sep 17 00:00:00 2001 From: ydong10 Date: Mon, 10 Sep 2012 03:03:40 +0000 Subject: [PATCH] When question not have storage with it, not restore old value for it. Signed-off-by: Eric Dong Reviewed-by: Liming Gao git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13710 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Universal/SetupBrowserDxe/Setup.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c index a15cc828cb..ed7f015d66 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c @@ -3654,6 +3654,11 @@ InitializeCurrentSetting ( FORM_BROWSER_FORM *Form2; EFI_STATUS Status; + // + // Extract default from IFR binary for no storage questions. + // + ExtractDefault (FormSet, NULL, EFI_HII_DEFAULT_CLASS_STANDARD, FormSetLevel, GetDefaultForNoStorage, NULL, TRUE); + // // Request current settings from Configuration Driver // @@ -3716,11 +3721,6 @@ InitializeCurrentSetting ( // If has old formset, get the old nv update status. // if (gOldFormSet != NULL) { - // - // Restore question value for questions without storage. - // - CopyOldValueForNoStorageQst (FormSet, gOldFormSet); - Link = GetFirstNode (&FormSet->FormListHead); while (!IsNull (&FormSet->FormListHead, Link)) { Form = FORM_BROWSER_FORM_FROM_LINK (Link); @@ -3738,11 +3738,6 @@ InitializeCurrentSetting ( } Link = GetNextNode (&FormSet->FormListHead, Link); } - } else { - // - // Extract default from IFR binary for no storage questions. - // - ExtractDefault (FormSet, NULL, EFI_HII_DEFAULT_CLASS_STANDARD, FormSetLevel, GetDefaultForNoStorage, NULL, TRUE); } return EFI_SUCCESS;