MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-177548 NPE at com.intellij.openapi.wm.ToolWindowManager.getActiveToolWindow on closing a project

Browse Source
This commit is contained in:
Denis Fokin
2017-09-26 11:59:59 +03:00
parent 7fee2c8607
commit 811f2efa6b
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/openapi/wm/ToolWindowManager.java
+9 -3
View File
@@ -165,10 +165,16 @@ public abstract class ToolWindowManager {
@Nullable
public static String getActiveId () {
ToolWindowManager instance = getInstance(Objects.requireNonNull(Objects.requireNonNull(IdeFocusManager.getGlobalInstance().getLastFocusedFrame()).getProject()));
return instance == null ? "" : instance.getActiveToolWindowId();
IdeFrame lastFocusedFrame = IdeFocusManager.getGlobalInstance().getLastFocusedFrame();
if (lastFocusedFrame !=null) {
Project project = lastFocusedFrame.getProject();
if (project != null) {
ToolWindowManager instance = getInstance(project);
return instance == null ? "" : instance.getActiveToolWindowId();
}
}
return "";
}