summaryrefslogtreecommitdiff
path: root/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
diff options
context:
space:
mode:
authorEric Dong <eric.dong@intel.com>2014-08-27 03:29:01 +0000
committerydong10 <ydong10@6f19259b-4bc3-4df7-8a09-765794883524>2014-08-27 03:29:01 +0000
commit275ea01efdf0aa7be0b5352ff185cc77aef129c0 (patch)
treed655a2dfb4a0c0913d04d37e07bd749394987a60 /MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
parentd1984abcb9a9fa7fe0b1e6ee13e71d943718bda8 (diff)
downloadedk2-platforms-275ea01efdf0aa7be0b5352ff185cc77aef129c0.tar.xz
Refine the fix for the bug that cause assert when do the reconnect in the callback function.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Eric Dong <eric.dong@intel.com> Reviewed-by: Liming Gao <liming.gao@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15914 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdeModulePkg/Universal/SetupBrowserDxe/Setup.c')
-rw-r--r--MdeModulePkg/Universal/SetupBrowserDxe/Setup.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index a8bbd582b5..2b09593b91 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -2449,7 +2449,10 @@ ValidateFormSet (
ASSERT (FormSet != NULL);
Find = ValidateHiiHandle(FormSet->HiiHandle);
- if (!Find) {
+ //
+ // Should not remove the formset which is being used.
+ //
+ if (!Find && (FormSet != gCurrentSelection->FormSet)) {
CleanBrowserStorage(FormSet);
RemoveEntryList (&FormSet->Link);
DestroyFormSet (FormSet);