From 7dc7ca86c9bdc29b19be677b993e733d860093ef Mon Sep 17 00:00:00 2001 From: Artem Bochkarev Date: Mon, 21 May 2018 15:36:15 +0700 Subject: [PATCH] IDEA-192349: fixed NPE broken in IDEA-163208: fix order of message dialog buttons fixed IDEA-192349 'Open project in a new window' confirmation popup broken: shows several popups instead of one, leads to inability to quit IDE (regression) --- .../src/com/intellij/ui/messages/SheetMessage.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/ui/messages/SheetMessage.java b/platform/platform-impl/src/com/intellij/ui/messages/SheetMessage.java index 221c711bbdf9..4af7d59763a1 100755 --- a/platform/platform-impl/src/com/intellij/ui/messages/SheetMessage.java +++ b/platform/platform-impl/src/com/intellij/ui/messages/SheetMessage.java @@ -142,7 +142,8 @@ class SheetMessage implements Disposable { LaterInvocator.enterModal(myWindow); final Runnable closer = _showTouchBar(buttons, defaultButton); myWindow.setVisible(true); - closer.run(); + if (closer != null) + closer.run(); LaterInvocator.leaveModal(myWindow); Component focusCandidate = beforeShowFocusOwner.get();