From 5465ec9a3dabc6a5ac923f60dcc082380ca403e9 Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Mon, 2 May 2011 15:03:13 +0000 Subject: [PATCH] Bug 344408: Cannot show mixed-mode disassembly when doing project-less debug --- .../core/sourcelookup/ProgramRelativePathSourceContainer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ProgramRelativePathSourceContainer.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ProgramRelativePathSourceContainer.java index bbd45d51d44..db35ef8bd3a 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ProgramRelativePathSourceContainer.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ProgramRelativePathSourceContainer.java @@ -141,10 +141,10 @@ public class ProgramRelativePathSourceContainer extends AbstractSourceContainer{ // Get current project. Unlike CDI, DSF supports debugging // executables that are not in an Eclipse project, so this may be - // null for a DSF session. See bugzilla 304433. + // null or empty for a DSF session. See bugzilla 304433 and 344408. ICProject project = null; String projectName = configuration.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, (String) null); - if (projectName != null) { + if (projectName != null && projectName.length() != 0) { project = CoreModel.getDefault().getCModel().getCProject(projectName); if (project == null || !project.exists()) { return fProgramPath; // return empty path