MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 03:21:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

NPE

Browse Source
This commit is contained in:
Alexey Kudravtsev
2010-01-18 13:57:59 +03:00
parent 56784db774
commit 7845b344da
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java
View File

@@ -814,7 +814,7 @@ public class AbstractPopup implements JBPopup {
}
private IdeFocusManager getFocusManager() {
return IdeFocusManager.getInstance(myProject);
return myProject == null ? null : IdeFocusManager.getInstance(myProject);
}
private static JComponent getTargetComponent(Component aComponent) {
@@ -908,7 +908,13 @@ public class AbstractPopup implements JBPopup {
resetWindow();
if (myFinalRunnable != null) {
getFocusManager().doWhenFocusSettlesDown(myFinalRunnable);
IdeFocusManager focusManager = getFocusManager();
if (focusManager != null) {
focusManager.doWhenFocusSettlesDown(myFinalRunnable);
}
else {
myFinalRunnable.run();
}
myFinalRunnable = null;
}
}