merge
authordadubrow
Wed, 07 Jul 2010 15:22:25 -0500
changeset 1593 09779f4a10b3
parent 1592 c832c22002bc (current diff)
parent 1590 39ba239eeb5c (diff)
child 1594 92ca7b538bd2
merge
--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java	Wed Jul 07 15:21:00 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java	Wed Jul 07 15:22:25 2010 -0500
@@ -680,9 +680,8 @@
 		if (project != null) {
 			configuration.setMappedResources( new IResource[] { project });
 		    ICarbideProjectInfo cpi = CarbideBuilderPlugin.getBuildManager().getProjectInfo(project);
-			if (cpi != null) {
-				configuration.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_BUILD_CONFIG_ID, cpi.getDefaultBuildConfigName());
-			}
+		    configuration.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_BUILD_CONFIG_ID, 
+		    		cpi != null ? cpi.getDefaultBuildConfigName() : ""); //$NON-NLS-1$
 		}
 		
 		// set rom log file defaults.  do this for all launch types since it shouldn't hurt