From 9c77a1978fa935770299cb665f41d568b085cd3b Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Sat, 22 Aug 2015 16:58:29 +0200
Subject: [PATCH] https://ea.jetbrains.com/browser/ea_problems/72044 Argument
 for @NotNull parameter 'executor' of
 com/intellij/execution/startup/ProjectStartupConfigurable$5.perform must not
 be null

java.lang.IllegalArgumentException: Argument for @NotNull parameter 'executor' of com/intellij/execution/startup/ProjectStartupConfigurable$5.perform must not be null
	at com.intellij.execution.startup.ProjectStartupConfigurable$5.perform(ProjectStartupConfigurable.java)
---
 .../execution/startup/ProjectStartupConfigurable.java        | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/execution/startup/ProjectStartupConfigurable.java b/platform/lang-impl/src/com/intellij/execution/startup/ProjectStartupConfigurable.java
index 883b74a45a1a..e428b8636f9f 100644
--- a/platform/lang-impl/src/com/intellij/execution/startup/ProjectStartupConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/execution/startup/ProjectStartupConfigurable.java
@@ -16,11 +16,11 @@
 package com.intellij.execution.startup;
 
 import com.intellij.execution.Executor;
-import com.intellij.execution.ExecutorRegistry;
 import com.intellij.execution.RunManager;
 import com.intellij.execution.RunnerAndConfigurationSettings;
 import com.intellij.execution.actions.ChooseRunConfigurationPopup;
 import com.intellij.execution.actions.ExecutorProvider;
+import com.intellij.execution.executors.DefaultRunExecutor;
 import com.intellij.execution.impl.EditConfigurationsDialog;
 import com.intellij.execution.impl.RunManagerImpl;
 import com.intellij.icons.AllIcons;
@@ -34,7 +34,6 @@ import com.intellij.openapi.options.SearchableConfigurable;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.popup.JBPopup;
 import com.intellij.openapi.util.Comparing;
-import com.intellij.openapi.wm.ToolWindowId;
 import com.intellij.ui.*;
 import com.intellij.ui.awt.RelativePoint;
 import com.intellij.ui.components.JBCheckBox;
@@ -224,7 +223,7 @@ public class ProjectStartupConfigurable implements SearchableConfigurable, Confi
   }
 
   private void selectAndAddConfiguration(final AnActionButton button) {
-    final Executor executor = ExecutorRegistry.getInstance().getExecutorById(ToolWindowId.DEBUG);
+    final Executor executor = DefaultRunExecutor.getRunExecutorInstance();
     final List<ChooseRunConfigurationPopup.ItemWrapper> wrappers = new ArrayList<ChooseRunConfigurationPopup.ItemWrapper>();
     wrappers.add(createEditWrapper());
     final ChooseRunConfigurationPopup.ItemWrapper[] allSettings =