From fce5016ea7812dcd51a5a62e5554f2bc07be8f25 Mon Sep 17 00:00:00 2001 From: Ken Ryall Date: Thu, 27 May 2010 04:01:37 +0000 Subject: [PATCH] Only enable the cdi-gdb activity on no run launches since they are used by DSF as well. --- .../src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java index 5a14503e439..35c329a5c90 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java @@ -129,7 +129,6 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat public AbstractCLaunchDelegate() { super(); - org.eclipse.cdt.launch.LaunchUtils.enableActivity("org.eclipse.cdt.debug.cdigdbActivity", true); //$NON-NLS-1$ } /* (non-Javadoc) @@ -781,6 +780,10 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat if(monitor == null) { monitor = new NullProgressMonitor(); } + + if(!mode.equals(ILaunchManager.RUN_MODE)) + org.eclipse.cdt.launch.LaunchUtils.enableActivity("org.eclipse.cdt.debug.cdigdbActivity", true); //$NON-NLS-1$ + workspaceBuildBeforeLaunch = false;