From f4155523a876e257d1f3e38ca630a6aaeb6c30c8 Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Tue, 7 Oct 2014 09:48:23 -0400 Subject: [PATCH] Revert "Bug 444208 - [remote] Specifing binary in launch config does not work if the name of binary is not same with the name of process" This reverts commit 03aa13f48d31dd582c0a609477d1a85e91ff347d. Change-Id: Ia1168c831377ea358d05d3f11d887bef36504b0f Reviewed-on: https://git.eclipse.org/r/34501 Reviewed-by: Marc Khouzam Tested-by: Marc Khouzam --- .../cdt/dsf/gdb/internal/ui/commands/GdbConnectCommand.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbConnectCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbConnectCommand.java index 44ae9b0d32d..70960a83545 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbConnectCommand.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbConnectCommand.java @@ -494,18 +494,18 @@ public class GdbConnectCommand extends RefreshableDebugCommand implements IConne // to do that before we supported multi-process. // Must do this here to be in the executor // Bug 350365 - IPath processPath = new Path(process.getName()); - String processShortName = processPath.lastSegment(); if (fProcessNameToBinaryMap.isEmpty()) { IPath binaryPath = backend.getProgramPath(); if (binaryPath != null && !binaryPath.isEmpty()) { - fProcessNameToBinaryMap.put(processShortName, binaryPath.toOSString()); + fProcessNameToBinaryMap.put(binaryPath.lastSegment(), binaryPath.toOSString()); } } // Because the prompt is a very long operation, we need to run outside the // executor, so we don't lock it. // Bug 344892 + IPath processPath = new Path(process.getName()); + String processShortName = processPath.lastSegment(); new PromptAndAttachToProcessJob(pidStr, LaunchUIMessages.getString("ProcessPrompterDialog.TitlePrefix") + process.getName(), //$NON-NLS-1$ processShortName, new AttachToProcessRequestMonitor()).schedule();