# HG changeset patch
# User timkelly
# Date 1271435321 18000
# Node ID ef43c8d0857894db8c1bc3ba6d2e7c37b608a912
# Parent  10a0a5ba7be112c7e58a07932458250eadabba03
fix npe

diff -r 10a0a5ba7be1 -r ef43c8d08578 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	Thu Apr 15 17:59:16 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/CarbideBuildConfigurationsPage.java	Fri Apr 16 11:28:41 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 10a0a5ba7be1 -r ef43c8d08578 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	Thu Apr 15 17:59:16 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/SBSv2BuildConfigTabComposite.java	Fri Apr 16 11:28:41 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;