From c71c65f1e79e9f33f6f3e791a92a724b06505ee9 Mon Sep 17 00:00:00 2001 From: Artem Bochkarev Date: Wed, 13 Mar 2019 12:36:18 +0700 Subject: [PATCH] touchbar: fixed IDEA-208708 JVM crashes when creating vcs diff window --- bin/mac/libnst64.dylib | Bin 63688 -> 63688 bytes native/MacTouchBar/src/TouchBar.m | 2 +- .../src/com/intellij/ui/mac/touchbar/NST.java | 4 ++-- .../intellij/ui/mac/touchbar/TBItemGroup.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/mac/libnst64.dylib b/bin/mac/libnst64.dylib index 399d8ee9a10498ededc22218fd8dd08c85fd2f09..24716823755a8fb35f0112faab358e6aa83c1d6c 100755 GIT binary patch delta 19822 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 diff --git a/native/MacTouchBar/src/TouchBar.m b/native/MacTouchBar/src/TouchBar.m index dc03cb2316f8..a0a6e92a7db8 100644 --- a/native/MacTouchBar/src/TouchBar.m +++ b/native/MacTouchBar/src/TouchBar.m @@ -30,7 +30,7 @@ NSTouchBarItem * result = (*_jcreator)([identifier UTF8String]); if (result == nil) - nserror(@"tb [%@]: can't make item for uid '%@'", identifier); + nserror(@"tb [%@]: can't make item for uid '%@'", self.name, identifier); return result; } diff --git a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/NST.java b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/NST.java index 629126ba5bd0..cc8d10e88b5f 100644 --- a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/NST.java +++ b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/NST.java @@ -156,8 +156,8 @@ public class NST { return scrubberNativePeer; } - public static ID createGroupItem(String uid, ID[] items, int count) { - return ourNSTLibrary.createGroupItem(uid, items, count); // called from AppKit, uses per-event autorelease-pool + public static ID createGroupItem(String uid, ID[] items) { + return ourNSTLibrary.createGroupItem(uid, items == null || items.length == 0 ? null : items, items.length); // called from AppKit, uses per-event autorelease-pool } public static void updateButton(ID buttonObj, diff --git a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/TBItemGroup.java b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/TBItemGroup.java index f443c6ff23e3..492d828f7862 100644 --- a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/TBItemGroup.java +++ b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/TBItemGroup.java @@ -26,7 +26,7 @@ class TBItemGroup extends TBItem { return ID.NIL; final ID[] ids = myGroupItems.getVisibleNativePeers(); - return NST.createGroupItem(myUid, ids, ids.length); + return NST.createGroupItem(myUid, ids); } @Override