summaryrefslogtreecommitdiff
path: root/IntelFrameworkModulePkg
diff options
context:
space:
mode:
authorEric Dong <eric.dong@intel.com>2014-01-08 08:21:22 +0000
committerydong10 <ydong10@6f19259b-4bc3-4df7-8a09-765794883524>2014-01-08 08:21:22 +0000
commit0b716fd7649f13ca6c214aa47f39ab00212c7d6e (patch)
treef6e0b7e7309a056c6a40568162e8090d6579c98f /IntelFrameworkModulePkg
parent6f497f8f71fa1c38b0b0204ff06f1d6d8256d8f1 (diff)
downloadjuice-0b716fd7649f13ca6c214aa47f39ab00212c7d6e.tar.gz
Rollback the patch 15054.
Signed-off-by: Eric Dong <eric.dong@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15059 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'IntelFrameworkModulePkg')
-rw-r--r--IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
index 6f094f207..69e402ef9 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
@@ -1,7 +1,7 @@
/** @file
File explorer related functions.
-Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -140,6 +140,9 @@ UpdateFileExplorer (
NewFileContext = (BM_FILE_CONTEXT *) NewMenuEntry->VariableContext;
if (NewFileContext->IsDir ) {
+ CallbackData->FeDisplayContext = FileExplorerDisplayDirectory;
+
+ RemoveEntryList (&NewMenuEntry->Link);
BOpt_FreeMenu (&DirectoryMenu);
Status = BOpt_FindFiles (CallbackData, NewMenuEntry);
if (EFI_ERROR (Status)) {
@@ -147,10 +150,10 @@ UpdateFileExplorer (
goto exit;
}
CreateMenuStringToken (CallbackData, CallbackData->FeHiiHandle, &DirectoryMenu);
+ BOpt_DestroyMenuEntry (NewMenuEntry);
UpdateFileExplorePage (CallbackData, &DirectoryMenu);
- CallbackData->FeDisplayContext = FileExplorerDisplayDirectory;
} else {
switch (CallbackData->FeCurrentState) {
case FileExplorerStateBootFromFile: