EA-34246 - IAE: JDialog <init>

Workaround
This commit is contained in:
Denis Fokin
2018-05-29 17:54:14 +03:00
parent db7e4ad7dd
commit aec014bf0d
2 changed files with 3 additions and 4 deletions
@@ -190,7 +190,7 @@ public class DialogWrapperPeerImpl extends DialogWrapperPeer {
else {
ActionCallback focused = new ActionCallback("DialogFocusedCallback");
ActionCallback typeAheadDone = new ActionCallback("DialogTypeAheadDone");
MyDialog dialog = new MyDialog(owner, wrapper, project, focused, typeAheadDone, typeAhead);
MyDialog dialog = new MyDialog(OwnerOptional.fromComponent(owner).get(), wrapper, project, focused, typeAheadDone, typeAhead);
dialog.setModalityType(ideModalityType.toAwtModality());
return dialog;
}
@@ -17,6 +17,7 @@ package com.intellij.util.ui;
import com.intellij.ide.IdeEventQueue;
import com.intellij.ide.IdePopupManager;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.wm.IdeFrame;
import com.intellij.openapi.wm.WindowManager;
import com.intellij.util.Consumer;
@@ -52,9 +53,7 @@ public class OwnerOptional {
if (manager.isPopupWindow(owner)) {
//manager.closeAllPopups();
if (!owner.isFocused()) {
if (!owner.isFocused() || !SystemInfo.isJetBrainsJvm) {
owner = owner.getOwner();
while (owner != null