From e24a04895a4c66b27d4cd09e1372d1a032029171 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Tue, 23 Jan 2018 13:20:53 -0500 Subject: [PATCH] Fix current patch concerning Container launching - fix CApplicationLaunchShortcut find config method test for Container build so we don't ignore valid local launch configs Change-Id: I4453ce2b26e15c9ec8ad53252e9e539c1268ddd8 --- .../debug/internal/ui/launch/CApplicationLaunchShortcut.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 e22d04ba2b0..a731c06e44f 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 @@ -101,7 +101,8 @@ public class CApplicationLaunchShortcut implements ILaunchShortcut2 { String projectName = CDebugUtils.getProjectName(config); IPath name = bin.getResource().getProjectRelativePath(); // don't match any launch config that is used for a Container launch - if (config.getAttribute(CONNECTION_URI, "").isEmpty()) { //$NON-NLS-1$ + String connectionURI = config.getAttribute(CONNECTION_URI, (String)null); + if (connectionURI == null) { //$NON-NLS-1$ if (programPath != null && programPath.equals(name)) { if (projectName != null && projectName.equals(bin.getCProject().getProject().getName())) { candidateConfigs.add(config);