From 4239136a9514f154d94782c53d71980ffbe46acb Mon Sep 17 00:00:00 2001
From: Marc Khouzam
Date: Tue, 26 Apr 2011 19:29:56 +0000
Subject: Bug 343861: Project should not be required to perform debugging

---
 .../eclipse/cdt/launch/remote/launching/RemoteGdbLaunchDelegate.java   | 2 +-
 .../src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFMainTab.java      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'cross')

diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/launching/RemoteGdbLaunchDelegate.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/launching/RemoteGdbLaunchDelegate.java
index 85e8afb71ee..029b478fc71 100644
--- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/launching/RemoteGdbLaunchDelegate.java
+++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/launching/RemoteGdbLaunchDelegate.java
@@ -48,7 +48,7 @@ public class RemoteGdbLaunchDelegate extends GdbLaunchDelegate {
 			}
 		}
 
-		IPath exePath = CDebugUtils.verifyProgramPath(config);
+		IPath exePath = checkBinaryDetails(config);
 		if (exePath != null) {
 			// 1.Download binary if needed
 			String remoteExePath = config.getAttribute(
diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFMainTab.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFMainTab.java
index 1d26b14eb6d..98ddacd1654 100644
--- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFMainTab.java
+++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFMainTab.java
@@ -22,6 +22,7 @@
  *******************************************************************************/
 package org.eclipse.cdt.launch.remote.tabs;
 
+import org.eclipse.cdt.core.model.ICProject;
 import org.eclipse.cdt.dsf.gdb.internal.ui.launching.CMainTab;
 import org.eclipse.cdt.internal.launch.remote.Messages;
 import org.eclipse.cdt.launch.remote.IRemoteConnectionConfigurationConstants;
@@ -506,9 +507,9 @@ public class RemoteCDSFMainTab extends CMainTab {
 		}
 
 		if (programName.length() != 0 && bUpdateRemote) {
-			IProject project = getCProject().getProject();
 			IPath exePath = new Path(programName);
 			if (!exePath.isAbsolute()) {
+				IProject project = getCProject().getProject();
 				exePath = project.getFile(programName).getLocation();
 
 				IPath wsRoot = project.getWorkspace().getRoot().getLocation();
-- 
cgit v1.2.3