npe in import old settings dialog

GitOrigin-RevId: e01666707e901b88ab575f42595c32817df7a4fc
This commit is contained in:
Gregory.Shrago
2020-05-13 17:36:12 +00:00
committed by intellij-monorepo-bot
parent 7b7dd70435
commit 21db441cef
@@ -16,12 +16,12 @@ import com.intellij.openapi.project.DumbAwareAction;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.IconLoader;
import com.intellij.openapi.util.NlsContexts;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.wm.IdeFocusManager;
import com.intellij.ui.GuiUtils;
import com.intellij.ui.UIBundle;
import com.intellij.ui.components.fields.ExtendableTextComponent;
import com.intellij.openapi.util.NlsContexts;
import com.intellij.util.ui.StartupUiUtil;
import com.intellij.util.ui.UIUtil;
import com.intellij.util.ui.accessibility.ScreenReader;
@@ -292,7 +292,8 @@ public class ComponentWithBrowseButton<Comp extends JComponent> extends JPanel i
public void showNotify() {
ComponentWithBrowseButton<?> component = reference.get();
if (component == null) return; // component is collected
Disposable disposable = UI_DISPOSABLE.getData(DataManager.getInstance().getDataContext(component));
Disposable disposable = ApplicationManager.getApplication() == null ? null :
UI_DISPOSABLE.getData(DataManager.getInstance().getDataContext(component));
if (disposable == null) return; // parent disposable not found
Disposer.register(disposable, component);
}