From: ydong10 <ydong10@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Fri, 15 Mar 2013 02:53:56 +0000 (+0000)
Subject: Refine the logic about gFunctionKeySetting, avoid some HII drivers can't show the... 
X-Git-Tag: edk2-stable201903~12643
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=4f353467b613538ab64d454cb9a977b49e7971fb;ds=sidebyside

Refine the logic about gFunctionKeySetting, avoid some HII drivers can't show the hotkey info.
Also add missing code in UI.c

Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14208 6f19259b-4bc3-4df7-8a09-765794883524
---

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index a63b9ce0ee..ae7ff7f774 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -305,8 +305,6 @@ SendForm (
   //
   InitializeBrowserStrings ();
 
-  gFunctionKeySetting = ENABLE_FUNCTION_KEY_SETTING;
-
   //
   // Ensure we are in Text mode
   //
@@ -4009,6 +4007,8 @@ InitializeFormSet (
     }
   }
 
+  gFunctionKeySetting = ENABLE_FUNCTION_KEY_SETTING;
+
   if ((gClassOfVfr & FORMSET_CLASS_FRONT_PAGE) == FORMSET_CLASS_FRONT_PAGE) {
     gFrontPageHandle = FormSet->HiiHandle;
     gFunctionKeySetting = NONE_FUNCTION_KEY_SETTING;
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
index e9f9f70eda..d54466e123 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
@@ -3285,7 +3285,8 @@ UiDisplayMenu (
           // Check whether Key matches the registered hot key.
           //
           HotKey = NULL;
-          if ((gBrowserSettingScope == SystemLevel) || (gFunctionKeySetting != NONE_FUNCTION_KEY_SETTING)) {
+          if ((gBrowserSettingScope == SystemLevel) || 
+              (Selection->FormEditable && gFunctionKeySetting != NONE_FUNCTION_KEY_SETTING)) {
             HotKey = GetHotKeyFromRegisterList (&Key);
           }
           if (HotKey != NULL) {