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

1 files changed, 6 insertions, 2 deletions

diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigFileExplorer.c b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigFileExplorer.c
index 3db71d686..548d95df5 100644
--- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigFileExplorer.c
+++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigFileExplorer.c
@@ -1,7 +1,7 @@
 /** @file

   Internal file explorer functions for SecureBoot configuration module.

 

-Copyright (c) 2012 - 2014, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2012 - 2013, 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

@@ -1133,6 +1133,9 @@ UpdateFileExplorer (
     NewFileContext = (SECUREBOOT_FILE_CONTEXT *) NewMenuEntry->FileContext;

 

     if (NewFileContext->IsDir ) {

+      PrivateData->FeDisplayContext = FileExplorerDisplayDirectory;

+

+      RemoveEntryList (&NewMenuEntry->Link);

       FreeMenu (&DirectoryMenu);

       Status = FindFiles (NewMenuEntry);

        if (EFI_ERROR (Status)) {

@@ -1140,9 +1143,10 @@ UpdateFileExplorer (
          goto OnExit;

        }

       CreateMenuStringToken (PrivateData->HiiHandle, &DirectoryMenu);

+      DestroyMenuEntry (NewMenuEntry);

+

       UpdateFileExplorePage (PrivateData->HiiHandle, &DirectoryMenu, PrivateData->FeCurrentState);

 

-      PrivateData->FeDisplayContext = FileExplorerDisplayDirectory;

     } else {

       if (PrivateData->FeCurrentState == FileExplorerStateEnrollPkFile) {

         FormId = SECUREBOOT_ADD_PK_FILE_FORM_ID;