Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Dallaway2019-03-29 15:22:27 -0400
committerJohn Dallaway2019-04-01 01:48:49 -0400
commitf85e3146d3fc62427d35ed8d61e6b13222c909e1 (patch)
tree0e1984c4de7399967b66bcfdd05fdf957d34b46f
parentc2779e8d3e2a57f9cc879d7bc3f1bf8e386dee54 (diff)
downloadorg.eclipse.cdt-f85e3146d3fc62427d35ed8d61e6b13222c909e1.tar.gz
org.eclipse.cdt-f85e3146d3fc62427d35ed8d61e6b13222c909e1.tar.xz
org.eclipse.cdt-f85e3146d3fc62427d35ed8d61e6b13222c909e1.zip
Bug 545941: Match launch configuration type
Change-Id: I552ea86b65782f1781d84f2e1fe9b0b8e435e3bd Signed-off-by: John Dallaway <john@dallaway.org.uk>
-rw-r--r--debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF2
-rw-r--r--debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/CApplicationLaunchShortcut.java6
2 files changed, 5 insertions, 3 deletions
diff --git a/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF
index f9e0c610a0..33b865bd7e 100644
--- a/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.debug.ui; singleton:=true
-Bundle-Version: 8.3.1.qualifier
+Bundle-Version: 8.3.2.qualifier
Bundle-Activator: org.eclipse.cdt.debug.ui.CDebugUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/CApplicationLaunchShortcut.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/CApplicationLaunchShortcut.java
index 46ec455d91..bf05313072 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/CApplicationLaunchShortcut.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/CApplicationLaunchShortcut.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2018 QNX Software Systems and others.
+ * Copyright (c) 2005, 2019 QNX Software Systems and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -11,6 +11,7 @@
* Contributors:
* QNX Software Systems - Initial API and implementation
* Ken Ryall (Nokia) - bugs 178731, 246201
+ * John Dallaway - Match launch configuration type (bug 545941)
*******************************************************************************/
package org.eclipse.cdt.debug.internal.ui.launch;
@@ -96,7 +97,8 @@ public class CApplicationLaunchShortcut implements ILaunchShortcut2 {
ILaunchConfiguration configuration = null;
List<ILaunchConfiguration> candidateConfigs = Collections.emptyList();
try {
- ILaunchConfiguration[] configs = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurations();
+ ILaunchConfigurationType type = getCLaunchConfigType();
+ ILaunchConfiguration[] configs = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurations(type);
candidateConfigs = new ArrayList<>(configs.length);
for (int i = 0; i < configs.length; i++) {
ILaunchConfiguration config = configs[i];

Back to the top