From fe946f5eee98a214d513f3a21cf904ab778b4d52 Mon Sep 17 00:00:00 2001 From: Denis Fokin Date: Fri, 30 Sep 2016 10:16:08 +0300 Subject: [PATCH] EA-89069 --- .../KeyboardInternationalizationNotificationManager.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/KeyboardInternationalizationNotificationManager.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/KeyboardInternationalizationNotificationManager.java index 4409728027ac..97070efb5053 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/KeyboardInternationalizationNotificationManager.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/KeyboardInternationalizationNotificationManager.java @@ -52,10 +52,14 @@ public class KeyboardInternationalizationNotificationManager { public static Notification createNotification(@NotNull final String groupDisplayId, @Nullable NotificationListener listener) { - final String productName = ApplicationNamesInfo.getInstance().getProductName(); - Window recentFocusedWindow = WindowManagerEx.getInstanceEx().getMostRecentFocusedWindow(); + if (recentFocusedWindow == null) { + recentFocusedWindow = Window.getWindows()[0]; + } + + final String productName = ApplicationNamesInfo.getInstance().getProductName(); + String text = "We have found out that you are using a non-english keyboard layout. You can enable smart layout support for " + KeyboardSettingsExternalizable.getDisplayLanguageNameForComponent(recentFocusedWindow) + " language." +