mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-22 06:02:11 +02:00
Code Issues Wiki Activity

Bug 547145 - Core build use of ProjectDescription should be synchronized

Browse source 
- also change ContainerLaunchConfigurationDelegate

Change-Id: I5574d67ae030e728605c12f7bc05bcbb8e23e83d
This commit is contained in:
Jeff Johnston 2019-05-15 17:16:43 -04:00
parent 19e4eabff2
commit a62215e851
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerLaunchConfigurationDelegate.java
View file

@ -30,6 +30,7 @@ import org.eclipse.cdt.core.build.ICBuildConfiguration;
import org.eclipse.cdt.core.build.ICBuildConfigurationManager; import org.eclipse.cdt.core.build.ICBuildConfigurationManager;
import org.eclipse.cdt.core.build.IToolChain; import org.eclipse.cdt.core.build.IToolChain;
import org.eclipse.cdt.core.build.IToolChainManager; import org.eclipse.cdt.core.build.IToolChainManager;
import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.core.model.IBinary; import org.eclipse.cdt.core.model.IBinary;
import org.eclipse.cdt.debug.core.CDebugCorePlugin; import org.eclipse.cdt.debug.core.CDebugCorePlugin;
import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants; import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
@ -582,9 +583,12 @@ public class ContainerLaunchConfigurationDelegate extends GdbLaunchDelegate impl
if (target != null) { if (target != null) {
ICBuildConfiguration cconfig = getBuildConfiguration(configuration, mode, target, monitor); ICBuildConfiguration cconfig = getBuildConfiguration(configuration, mode, target, monitor);
if (cconfig != null) { if (cconfig != null) {
IProjectDescription desc = project.getDescription(); CoreModel model = CoreModel.getDefault();
desc.setActiveBuildConfig(cconfig.getBuildConfiguration().getName()); synchronized (model) {
project.setDescription(desc, monitor); IProjectDescription desc = project.getDescription();
desc.setActiveBuildConfig(cconfig.getBuildConfiguration().getName());
project.setDescription(desc, monitor);
}
} }
} }
} }