From 5aa3d712b8a6a9cfb27c76d8a2b095eeb8dc6118 Mon Sep 17 00:00:00 2001 From: serb Date: Thu, 29 Mar 2012 17:31:48 +0400 Subject: [PATCH] 7124551: [macosx] Once added, Menu shortcut cannot be removed Reviewed-by: art, anthony --- src/macosx/native/sun/awt/CMenuItem.m | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/macosx/native/sun/awt/CMenuItem.m b/src/macosx/native/sun/awt/CMenuItem.m index 5fdf71136..aa0c2ab03 100644 --- a/src/macosx/native/sun/awt/CMenuItem.m +++ b/src/macosx/native/sun/awt/CMenuItem.m @@ -125,11 +125,8 @@ AWT_ASSERT_NOT_APPKIT_THREAD; [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){ AWT_ASSERT_APPKIT_THREAD; - - if (![theKeyEquivalent isEqualToString:@""]) { - [fMenuItem setKeyEquivalent:theKeyEquivalent]; - [fMenuItem setKeyEquivalentModifierMask:modifierMask]; - } + [fMenuItem setKeyEquivalent:theKeyEquivalent]; + [fMenuItem setKeyEquivalentModifierMask:modifierMask]; [fMenuItem setTitle:theLabel]; }]; } -- GitLab