From 48b6e9207fbee6977cdc7d170825dc4ed5f51398 Mon Sep 17 00:00:00 2001
From: Marc Khouzam <marc.khouzam@ericsson.com>
Date: Thu, 29 Jul 2010 18:55:54 +0000
Subject: [PATCH] Bug 321259: Need to set environment dir before sourcing init
 file, so that we look for the init file in the right place

---
 .../gdb/launching/FinalLaunchSequence.java    | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence.java
index ebdb9f5c8d5..5d8191acf6a 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence.java
@@ -102,6 +102,28 @@ public class FinalLaunchSequence extends Sequence {
 
             requestMonitor.done();
         }},
+    	/*
+    	 * Specify GDB's working directory
+    	 */
+        new Step() { @Override
+        public void execute(final RequestMonitor requestMonitor) {
+   			IPath dir = null;
+       		try {
+       			dir = fGDBBackend.getGDBWorkingDirectory();
+       		} catch (CoreException e) {
+       			requestMonitor.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, -1, "Cannot get working directory", e)); //$NON-NLS-1$
+       			requestMonitor.done();
+       			return;
+      		}
+
+        	if (dir != null) {
+        		fCommandControl.queueCommand(
+        				fCommandFactory.createMIEnvironmentCD(fCommandControl.getContext(), dir.toPortableString()), 
+        				new DataRequestMonitor<MIInfo>(getExecutor(), requestMonitor));
+        	} else {
+        		requestMonitor.done();
+        	}
+        }},
     	/*
     	 * Source the gdbinit file specified in the launch
     	 */
@@ -134,28 +156,6 @@ public class FinalLaunchSequence extends Sequence {
         		requestMonitor.done();
         	}
         }},
-    	/*
-    	 * Specify GDB's working directory
-    	 */
-        new Step() { @Override
-        public void execute(final RequestMonitor requestMonitor) {
-   			IPath dir = null;
-       		try {
-       			dir = fGDBBackend.getGDBWorkingDirectory();
-       		} catch (CoreException e) {
-       			requestMonitor.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, -1, "Cannot get working directory", e)); //$NON-NLS-1$
-       			requestMonitor.done();
-       			return;
-      		}
-
-        	if (dir != null) {
-        		fCommandControl.queueCommand(
-        				fCommandFactory.createMIEnvironmentCD(fCommandControl.getContext(), dir.toPortableString()), 
-        				new DataRequestMonitor<MIInfo>(getExecutor(), requestMonitor));
-        	} else {
-        		requestMonitor.done();
-        	}
-        }},
     	/*
     	 * Specify environment variables if needed
     	 */