From 1c57b8cc7847154270df2ffebdc45d2381a3e00b Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Sat, 13 Feb 2021 16:24:45 +0000
Subject: [PATCH] lcl: cocoa: fixed keyboard navigation in open dialog

git-svn-id: trunk@64571 -
---
 lcl/interfaces/cocoa/cocoawsmenus.pas | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lcl/interfaces/cocoa/cocoawsmenus.pas b/lcl/interfaces/cocoa/cocoawsmenus.pas
index 94550f6533..c6cc7ab7e4 100644
--- a/lcl/interfaces/cocoa/cocoawsmenus.pas
+++ b/lcl/interfaces/cocoa/cocoawsmenus.pas
@@ -284,10 +284,16 @@ begin
 end;
 
 function TCocoaMenu.performKeyEquivalent(theEvent: NSEvent): LCLObjCBoolean;
+var
+  OldKeyEq: boolean;
 begin
+  OldKeyEq:=isKeyEq;
   isKeyEq := true;
-  inherited performKeyEquivalent(theEvent);
-  isKeyEq := false;
+  try
+    inherited performKeyEquivalent(theEvent);
+  finally
+    isKeyEq := OldKeyEq;
+  end;
 end;
 
 function TCocoaMenu.lclIsKeyEquivalent: LCLObjCBoolean;