From 21db441cefed74b95a9a294be356bcd91ae5a330 Mon Sep 17 00:00:00 2001
From: "Gregory.Shrago" <gregory.shrago@jetbrains.com>
Date: Wed, 13 May 2020 20:34:10 +0300
Subject: [PATCH] npe in import old settings dialog

GitOrigin-RevId: e01666707e901b88ab575f42595c32817df7a4fc
---
 .../com/intellij/openapi/ui/ComponentWithBrowseButton.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/platform/platform-api/src/com/intellij/openapi/ui/ComponentWithBrowseButton.java b/platform/platform-api/src/com/intellij/openapi/ui/ComponentWithBrowseButton.java
index 2bde3ea65b6a..6f4ce05bfa29 100644
--- a/platform/platform-api/src/com/intellij/openapi/ui/ComponentWithBrowseButton.java
+++ b/platform/platform-api/src/com/intellij/openapi/ui/ComponentWithBrowseButton.java
@@ -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);
     }