From f85e3146d3fc62427d35ed8d61e6b13222c909e1 Mon Sep 17 00:00:00 2001 From: John Dallaway Date: Fri, 29 Mar 2019 19:22:27 +0000 Subject: [PATCH] Bug 545941: Match launch configuration type Change-Id: I552ea86b65782f1781d84f2e1fe9b0b8e435e3bd Signed-off-by: John Dallaway --- debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF | 2 +- .../internal/ui/launch/CApplicationLaunchShortcut.java | 6 ++++-- 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 f9e0c610a0b..33b865bd7ea 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 46ec455d919..bf05313072e 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 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];