From 5bf8936d3c71848dc072a00807d94cdf04a9532b Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Mon, 2 Mar 2009 20:41:49 +0000 Subject: [PATCH] [26674] GdbLaunch made the assumption that if GdbLaunch.shutdownSession has been called, the entire launch has been terminated. This is not true when another process was added to the launch. This fix makes it so that calling GdbLaunch.shutdownSession does not imply the entire launch is terminated. --- .../eclipse/cdt/dsf/gdb/launching/GdbLaunch.java | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunch.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunch.java index 79899995dea..261aff1f991 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunch.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunch.java @@ -201,19 +201,7 @@ public class GdbLaunch extends Launch // ITerminate @Override public boolean canTerminate() { - return super.canTerminate() && fInitialized && !fShutDown; - } - - @Override - public boolean isTerminated() { - return super.isTerminated() || fShutDown; - } - - - @Override - public void terminate() throws DebugException { - if (fShutDown) return; - super.terminate(); + return fInitialized && super.canTerminate(); } // ITerminate ///////////////////////////////////////////////////////////////////////////