From e475fefbdaf91aa8c621f684d5c70dd7819c74a8 Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Tue, 12 May 2015 15:26:32 +0300 Subject: [PATCH] EA-68328 - IAE: AbstractPopup.showInCenterOf --- .../src/com/intellij/ide/actions/Switcher.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java b/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java index 5ca9f2e3036a..131f11bb18f0 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java @@ -45,6 +45,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.wm.IdeFocusManager; import com.intellij.openapi.wm.ToolWindow; import com.intellij.openapi.wm.ToolWindowManager; +import com.intellij.openapi.wm.WindowManager; import com.intellij.openapi.wm.impl.ToolWindowImpl; import com.intellij.openapi.wm.impl.ToolWindowManagerImpl; import com.intellij.ui.*; @@ -584,7 +585,10 @@ public class Switcher extends AnAction implements DumbAware { } }.registerCustomShortcutSet(TW_SHORTCUT, this, myPopup); - final Window window = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusedWindow(); + Window window = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusedWindow(); + if (window == null) { + window = WindowManager.getInstance().getFrame(project); + } myAlarm = new Alarm(Alarm.ThreadToUse.SWING_THREAD, myPopup); myPopup.showInCenterOf(window); }