IDEA-109507 Crash in start-up initial configuration screen

This commit is contained in:
peter
2013-06-25 19:29:41 +02:00
parent f1cc522125
commit 7e85581ef8
@@ -1518,8 +1518,12 @@ public abstract class DialogWrapper {
menuSelectionManager.clearSelectedPath();
}
else {
if (ApplicationManager.getApplication() == null) {
doCancelAction(e);
return;
}
final StackingPopupDispatcher popupDispatcher = StackingPopupDispatcher.getInstance();
if (ApplicationManager.getApplication() == null || popupDispatcher != null && !popupDispatcher.isPopupFocused()) {
if (popupDispatcher != null && !popupDispatcher.isPopupFocused()) {
doCancelAction(e);
}
}