Skip to main content
summaryrefslogtreecommitdiffstats
path: root/launch
diff options
context:
space:
mode:
authorDoug Schaefer2018-11-29 13:31:16 -0500
committerDoug Schaefer2018-11-29 13:31:16 -0500
commit1a8b9a9628cccc3fdff7c097f4c78cc9157f0d7e (patch)
tree1b42d47a626f7d160e4669422c55148cf66527d6 /launch
parent62143e2bd7ac7a213a69cd350abb0fdab3616529 (diff)
downloadorg.eclipse.cdt-1a8b9a9628cccc3fdff7c097f4c78cc9157f0d7e.tar.gz
org.eclipse.cdt-1a8b9a9628cccc3fdff7c097f4c78cc9157f0d7e.tar.xz
org.eclipse.cdt-1a8b9a9628cccc3fdff7c097f4c78cc9157f0d7e.zip
Bug 541709 Fix up exceptions when we can't find toolchains.
We weren't checking the case where the size of the toolchains array was zero. Return a null config in that case and fix up the CommonBuildTab to deal with that. Change-Id: Ibd8f659988f1463570bdb2654d6ea2b4a45866c2
Diffstat (limited to 'launch')
-rw-r--r--launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/corebuild/CommonBuildTab.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/corebuild/CommonBuildTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/corebuild/CommonBuildTab.java
index e58984d8f0..fafcfc3c4b 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/corebuild/CommonBuildTab.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/corebuild/CommonBuildTab.java
@@ -30,7 +30,6 @@ import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
import org.eclipse.debug.ui.ILaunchConfigurationDialog;
import org.eclipse.launchbar.core.target.ILaunchTarget;
import org.eclipse.launchbar.ui.ILaunchBarLaunchConfigDialog;
-import org.eclipse.launchbar.ui.internal.Activator;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
@@ -182,7 +181,7 @@ public abstract class CommonBuildTab extends AbstractLaunchConfigurationTab {
private boolean toolchainChanged() {
int i = tcCombo.getSelectionIndex();
- if (i < 0) {
+ if (i < 0 || toolchains.length == 0) {
buildConfig = null;
return false;
} else if (i == 0) {
@@ -199,7 +198,7 @@ public abstract class CommonBuildTab extends AbstractLaunchConfigurationTab {
try {
buildConfig = bcManager.getBuildConfiguration(project, newToolchain, mode, new NullProgressMonitor());
} catch (CoreException e) {
- Activator.log(e.getStatus());
+ LaunchUIPlugin.log(e.getStatus());
}
return true;

Back to the top