# HG changeset patch
# User dadubrow
# Date 1278534145 18000
# Node ID 09779f4a10b3c6af2e85a7621c2eb21062c53945
# Parent  c832c22002bc1000c253d0684f17b2d58e5275f2# Parent  39ba239eeb5cab8e147f4a1f60f8a24bff514835
merge

diff -r c832c22002bc -r 09779f4a10b3 debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java
--- 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