From c7d8b98c01e03bcce9c6208987ea465f72c02258 Mon Sep 17 00:00:00 2001 From: Denis Fokin Date: Thu, 18 Dec 2014 14:15:21 +0300 Subject: [PATCH] IDEA-133699 Focus is stolen by IDEA to activate editor after project opening --- .../src/com/intellij/ui/messages/SheetMessage.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 c59ca5cedfcf..40b7ed6a4c6f 100755 --- a/platform/platform-impl/src/com/intellij/ui/messages/SheetMessage.java +++ b/platform/platform-impl/src/com/intellij/ui/messages/SheetMessage.java @@ -123,8 +123,11 @@ public class SheetMessage { focusCandidate = IdeFocusManager.getGlobalInstance().getLastFocusedFor(IdeFocusManager.getGlobalInstance().getLastFocusedFrame()); } - LOG.assertTrue(focusCandidate != null, "The should return focus on closing the message"); - focusCandidate.requestFocus(); + // focusCandidate is null if a welcome screen is closed and ide frame is not opened. + // this is ok. We set focus correctly on our frame activation. + if (focusCandidate != null) { + focusCandidate.requestFocus(); + } } private static void maximizeIfNeeded(final Window owner) {