summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c b/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c
index 44f087fe01..7390f954b6 100644
--- a/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c
+++ b/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c
@@ -2882,7 +2882,6 @@ UiDisplayMenu (
//
ControlFlag = CfUpdateHelpString;
- ASSERT (NewPos != NULL);
UpdateHighlightMenuInfo(NewPos, TopOfScreen, SkipValue);
if (SkipHighLight) {
@@ -2911,7 +2910,7 @@ UiDisplayMenu (
Temp2 = 0;
}
- if (MenuOption == NULL || NewPos != &MenuOption->Link) {
+ if (NewPos != NULL && (MenuOption == NULL || NewPos != &MenuOption->Link)) {
if (MenuOption != NULL) {
//
// Remove the old highlight menu.