From aaadc065db5f20ef43057071497181775a265698 Mon Sep 17 00:00:00 2001 From: irengrig Date: Thu, 20 Aug 2015 17:13:48 +0200 Subject: [PATCH] project startup tasks, correct shared state transitions: for the case when project just checked out from vcs + no local state --- .../execution/startup/ProjectStartupConfiguration.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/platform/lang-impl/src/com/intellij/execution/startup/ProjectStartupConfiguration.java b/platform/lang-impl/src/com/intellij/execution/startup/ProjectStartupConfiguration.java index 325c6345c694..8a199c45e977 100644 --- a/platform/lang-impl/src/com/intellij/execution/startup/ProjectStartupConfiguration.java +++ b/platform/lang-impl/src/com/intellij/execution/startup/ProjectStartupConfiguration.java @@ -41,6 +41,7 @@ public class ProjectStartupConfiguration { private final ProjectStartupSharedConfiguration myShared; private final ProjectStartupLocalConfiguration myLocal; private final RunManagerEx myRunManager; + private boolean myInitialized; public static ProjectStartupConfiguration getInstance(@NotNull final Project project) { return ServiceManager.getService(project, ProjectStartupConfiguration.class); @@ -57,6 +58,10 @@ public class ProjectStartupConfiguration { public List getStartupConfigurations() { final List result = new ArrayList(); if (! myShared.isEmpty()) { + if (! myInitialized) { + myLocal.shared(); + myInitialized = true; + } myLocal.clear(); return fillResult(result, myShared.getList(), true); }