From e76f05df90ab483ce796b1dc28ec153ee6ad59ff Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Fri, 14 May 2010 02:44:35 +0000 Subject: [PATCH] Bug 284573: Do force a preferred launch delegate if the configuration type already has one (which is set in the global preference for preferred launch delegate) --- .../internal/ui/launch/CApplicationLaunchShortcut.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) 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 a76decb2b4f..8c1b2b610fe 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 @@ -48,7 +48,6 @@ import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfigurationType; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; -import org.eclipse.debug.core.ILaunchDelegate; import org.eclipse.debug.core.ILaunchManager; import org.eclipse.debug.ui.DebugUITools; import org.eclipse.debug.ui.IDebugModelPresentation; @@ -207,8 +206,7 @@ public class CApplicationLaunchShortcut implements ILaunchShortcut2 { try { HashSet set = new HashSet(); set.add(ILaunchManager.RUN_MODE); - ILaunchDelegate preferredDelegate = wc.getPreferredDelegate(set); - if (preferredDelegate == null) { + if (wc.getPreferredDelegate(set) == null && wc.getType().getPreferredDelegate(set) == null) { wc.setPreferredLaunchDelegate(set, ICDTLaunchConfigurationConstants.PREFERRED_RUN_LAUNCH_DELEGATE); } } catch (CoreException e) {} @@ -218,8 +216,7 @@ public class CApplicationLaunchShortcut implements ILaunchShortcut2 { try { HashSet set = new HashSet(); set.add(ILaunchManager.DEBUG_MODE); - ILaunchDelegate preferredDelegate = wc.getPreferredDelegate(set); - if (preferredDelegate == null) { + if (wc.getPreferredDelegate(set) == null && wc.getType().getPreferredDelegate(set) == null) { wc.setPreferredLaunchDelegate(set, ICDTLaunchConfigurationConstants.PREFERRED_DEBUG_LOCAL_LAUNCH_DELEGATE); } } catch (CoreException e) {}