mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-06 09:16:02 +02:00
Code Issues Wiki Activity

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)

Browse source
This commit is contained in:
Marc Khouzam 2010-05-14 02:44:35 +00:00
parent e6499a96f6
commit e76f05df90
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/CApplicationLaunchShortcut.java
View file

@ -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<String> set = new HashSet<String>();
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<String> set = new HashSet<String>();
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) {}