From 10e8d1fba1c5b20b3e8501eace802a265ff37d3f Mon Sep 17 00:00:00 2001
From: Oleg Krasilnikov <oleg.krasilnikov@intel.com>
Date: Wed, 4 Apr 2007 10:49:29 +0000
Subject: [PATCH] Discovery Tab: NPE while working with preferences - fixed.

---
 .../cdt/managedbuilder/ui/properties/DiscoveryTab.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java
index e3faf7c2720..f9ccff6829d 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java
@@ -189,7 +189,7 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
  		configPath = rcfg.getPath();
  		IConfiguration cfg = getCfg(rcfg.getConfiguration());
  		cbi = CfgScannerConfigProfileManager.getCfgScannerConfigBuildInfo(cfg);
- 		if(baseInfoMap == null){
+ 		if(!page.isForPrefs() && baseInfoMap == null){
 			try {
 				IScannerConfigBuilderInfo2Set baseCbi = ScannerConfigProfileManager.createScannerConfigBuildInfo2Set(cfg.getOwner().getProject());
 				baseInfoMap = baseCbi.getInfoMap();
@@ -398,7 +398,7 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
 			}
 		}
         buildInfo.setSelectedProfileId(savedId);
-        
+        handleDiscoveryProfileChanged();
         if(ok)
         	clearChangedDiscoveredInfos();
 	}