From 847ec6e4af85c486ffafd40d7c6f9e1ec6eb83b0 Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Thu, 9 Apr 2015 15:05:09 +0300 Subject: [PATCH] external system: possible npe fix in tasks activation dialog --- .../service/task/ui/ConfigureTasksActivationDialog.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/task/ui/ConfigureTasksActivationDialog.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/task/ui/ConfigureTasksActivationDialog.java index 8e997ebde602..be8baf026529 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/task/ui/ConfigureTasksActivationDialog.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/task/ui/ConfigureTasksActivationDialog.java @@ -155,6 +155,8 @@ public class ConfigureTasksActivationDialog extends DialogWrapper { @Override public void run(AnActionButton button) { ProjectItem projectItem = (ProjectItem)projectCombobox.getSelectedItem(); + if(projectItem == null) return; + final ExternalProjectInfo projectData = ProjectDataManager.getInstance() .getExternalProjectData(myProject, myProjectSystemId, projectItem.myProjectSettings.getExternalProjectPath()); @@ -513,6 +515,7 @@ public class ConfigureTasksActivationDialog extends DialogWrapper { @Override protected MyNode[] buildChildren() { ProjectItem item = (ProjectItem)projectCombobox.getSelectedItem(); + if(item == null) return new MyNode[]{}; if (item.myProjectSettings.getModules().isEmpty() || item.myProjectSettings.getModules().size() == 1) { final TaskActivationState tasksActivation = myStateProvider.getTasksActivation(myProjectSystemId, item.myProjectSettings.getExternalProjectPath());