From fa8c801dcc256bdbe3eca13b70e13bb2f7fd4457 Mon Sep 17 00:00:00 2001
From: Marc Khouzam <marc.khouzam@ericsson.com>
Date: Fri, 3 Jun 2011 18:10:54 +0000
Subject: [PATCH] Bug 348159: Tracing console is not shown automatically.  Hack
 to get it working in time for Indigo.  Needs to be revisited.

---
 .../org/eclipse/cdt/dsf/gdb/launching/LaunchUtils.java    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchUtils.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchUtils.java
index 2f2ef8b96ab..d294c6a69e2 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchUtils.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchUtils.java
@@ -439,7 +439,13 @@ public class LaunchUtils {
 	public static boolean getIsNonStopMode(ILaunchConfiguration config) {
 		try {
 			return config.getAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUGGER_NON_STOP,
-					getIsNonStopModeDefault());
+			// This call causes a race condition with the TraceControlManager
+			// Don't use it for now, until we find a fix.
+			// Consequence is that a Debug As->C/C++ application shortcut will not follow
+			// the preference for non-stop.  This is not as bad as not have the gdb traces
+			// Bug 348159
+					IGDBLaunchConfigurationConstants.DEBUGGER_NON_STOP_DEFAULT);
+//					getIsNonStopModeDefault());
     	} catch (CoreException e) {    		
     	}
     	return false;