7124551: [macosx] Once added, Menu shortcut cannot be removed

Reviewed-by: art, anthony

7124551: [macosx] Once added, Menu shortcut cannot be removed
Reviewed-by: art, anthony
5aa3d712 · serb · 120c2766 · 5aa3d712
隐藏空白更改
内联并排

Showing with 2 addition and 5 deletion

src/macosx/native/sun/awt/CMenuItem.m src/macosx/native/sun/awt/CMenuItem.m +2 -5

未找到文件。
--- 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];
    }];
 }