Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorDoug Schaefer2017-11-20 18:28:22 +0000
committerDoug Schaefer2017-11-20 18:28:22 +0000
commitdc4be72b1ae13020fcbd8dbb46f8c6f9b9eb973b (patch)
tree05e0cd9927d9179fd510a4312b0226a5415d6ad7 /core
parentaedf6d8fa96c55c4e9fded7dba3c158a6493586f (diff)
downloadorg.eclipse.cdt-dc4be72b1ae13020fcbd8dbb46f8c6f9b9eb973b.tar.gz
org.eclipse.cdt-dc4be72b1ae13020fcbd8dbb46f8c6f9b9eb973b.tar.xz
org.eclipse.cdt-dc4be72b1ae13020fcbd8dbb46f8c6f9b9eb973b.zip
Fix MSYS2 so that it's provider overrides the path provider.
Also handle case when launchMode is null when creating a build config. Change-Id: Ie70de785168c2e24c842d517c64a297ba44e24f4
Diffstat (limited to 'core')
-rw-r--r--core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java
index 92f5f8eb695..8bd5cc76e6b 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java
@@ -149,7 +149,9 @@ public abstract class CBuildConfiguration extends PlatformObject
Preferences settings = getSettings();
settings.put(TOOLCHAIN_TYPE, toolChain.getTypeId());
settings.put(TOOLCHAIN_ID, toolChain.getId());
- settings.put(LAUNCH_MODE, launchMode);
+ if (launchMode != null) {
+ settings.put(LAUNCH_MODE, launchMode);
+ }
try {
settings.flush();
} catch (BackingStoreException e) {

Back to the top