# HG changeset patch # User wpaul # Date 1250193379 18000 # Node ID 1137da10d4e52ccd53349190d3d90686614a0eca # Parent d19f4087230da5fd5113b4fef00b7df19fc8a291 fixed bug #9283. diff -r d19f4087230d -r 1137da10d4e5 debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/CarbideExecutablesProvider.java --- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/CarbideExecutablesProvider.java Thu Aug 13 14:40:37 2009 -0500 +++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/CarbideExecutablesProvider.java Thu Aug 13 14:56:19 2009 -0500 @@ -35,6 +35,7 @@ import com.nokia.carbide.cdt.builder.CarbideBuilderPlugin; import com.nokia.carbide.cdt.builder.EpocEngineHelper; +import com.nokia.carbide.cdt.builder.project.ICarbideBuildConfiguration; import com.nokia.carbide.cdt.builder.project.ICarbideProjectInfo; public class CarbideExecutablesProvider implements IProjectExecutablesProvider { @@ -58,30 +59,33 @@ if (CarbideBuilderPlugin.getBuildManager().isCarbideProject(project)) { ICarbideProjectInfo cpi = CarbideBuilderPlugin.getBuildManager().getProjectInfo(project); if (cpi != null) { - List mmps = EpocEngineHelper.getMMPFilesForBuildConfiguration(cpi.getDefaultConfiguration()); + ICarbideBuildConfiguration config = cpi.getDefaultConfiguration(); + if (config != null) { + List mmps = EpocEngineHelper.getMMPFilesForBuildConfiguration(config); - SubMonitor progress = SubMonitor.convert(monitor, mmps.size()); + SubMonitor progress = SubMonitor.convert(monitor, mmps.size()); - for (IPath mmp : mmps) { - if (progress.isCanceled()) { - break; - } - - progress.subTask("Parsing " + mmp.lastSegment()); + for (IPath mmp : mmps) { + if (progress.isCanceled()) { + break; + } + + progress.subTask("Parsing " + mmp.lastSegment()); - IPath hp = EpocEngineHelper.getHostPathForExecutable(cpi.getDefaultConfiguration(), mmp); - if (hp != null) { - File hpFile = hp.toFile(); - if (hpFile.exists()) { - try { - Executable exe = new Executable(new Path(hpFile.getCanonicalPath()), project, null); - executables.add(exe); - } catch (Exception e) { + IPath hp = EpocEngineHelper.getHostPathForExecutable(config, mmp); + if (hp != null) { + File hpFile = hp.toFile(); + if (hpFile.exists()) { + try { + Executable exe = new Executable(new Path(hpFile.getCanonicalPath()), project, null); + executables.add(exe); + } catch (Exception e) { + } } } + + progress.worked(1); } - - progress.worked(1); } } }