# HG changeset patch
# User dadubrow
# Date 1271435635 18000
# Node ID 56b5cd0c538df1fabbc0b63b81d903c1ab6ffcab
# Parent  71146ed4b8a151447fea021a1412a09d83389d71# Parent  ef43c8d0857894db8c1bc3ba6d2e7c37b608a912
merge

diff -r 71146ed4b8a1 -r 56b5cd0c538d builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/CarbideBuildConfigurationsPage.java
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/CarbideBuildConfigurationsPage.java	Fri Apr 16 11:32:51 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/CarbideBuildConfigurationsPage.java	Fri Apr 16 11:33:55 2010 -0500
@@ -659,8 +659,10 @@
 		// Compare each of the settings to see if they are the same
 		boolean sisSettingsEqual = sisFilesBlock.compareConfigurationSettings(selectedConfig, writeToConfig);
 		
-		boolean sbsv2ConfigEqual = sbsv2BuildConfigTabComposite.compareConfigurationSettings(selectedConfig, writeToConfig);
-		
+		boolean sbsv2ConfigEqual = true;
+		if (sbsv2BuildConfigTabComposite != null) { 
+			sbsv2ConfigEqual = sbsv2BuildConfigTabComposite.compareConfigurationSettings(selectedConfig, writeToConfig);
+		}
 		// Compare envVars settings
 		boolean envVarsSettingsEqual = envVarList.size() == envVarListOrig.size() && envVarList.equals(envVarListOrig);
 		if (!envVarsSettingsEqual && writeToConfig) {
diff -r 71146ed4b8a1 -r 56b5cd0c538d builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/SBSv2BuildConfigTabComposite.java
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/SBSv2BuildConfigTabComposite.java	Fri Apr 16 11:32:51 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/SBSv2BuildConfigTabComposite.java	Fri Apr 16 11:33:55 2010 -0500
@@ -38,8 +38,8 @@
 
 public class SBSv2BuildConfigTabComposite extends Composite {
 	
-	private static final String configCmdLabelPrefixText = "Configuration Command: -c "; 
-	private static final String releaseTreeLabelPrefixText = "Release Tree: "; 
+	private static final String configCmdLabelPrefixText = "Configuration Command: -c "; // $NON-NLS-N$ 
+	private static final String releaseTreeLabelPrefixText = "Release Tree: "; // $NON-NLS-N$
 	
 	Text variantEdit;