mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-23 22:52:11 +02:00
Discovery Tab: NPE while working with preferences - fixed.
This commit is contained in:
parent
af1e9d0989
commit
10e8d1fba1
1 changed files with 2 additions and 2 deletions
|
@ -189,7 +189,7 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
|
||||||
configPath = rcfg.getPath();
|
configPath = rcfg.getPath();
|
||||||
IConfiguration cfg = getCfg(rcfg.getConfiguration());
|
IConfiguration cfg = getCfg(rcfg.getConfiguration());
|
||||||
cbi = CfgScannerConfigProfileManager.getCfgScannerConfigBuildInfo(cfg);
|
cbi = CfgScannerConfigProfileManager.getCfgScannerConfigBuildInfo(cfg);
|
||||||
if(baseInfoMap == null){
|
if(!page.isForPrefs() && baseInfoMap == null){
|
||||||
try {
|
try {
|
||||||
IScannerConfigBuilderInfo2Set baseCbi = ScannerConfigProfileManager.createScannerConfigBuildInfo2Set(cfg.getOwner().getProject());
|
IScannerConfigBuilderInfo2Set baseCbi = ScannerConfigProfileManager.createScannerConfigBuildInfo2Set(cfg.getOwner().getProject());
|
||||||
baseInfoMap = baseCbi.getInfoMap();
|
baseInfoMap = baseCbi.getInfoMap();
|
||||||
|
@ -398,7 +398,7 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
buildInfo.setSelectedProfileId(savedId);
|
buildInfo.setSelectedProfileId(savedId);
|
||||||
|
handleDiscoveryProfileChanged();
|
||||||
if(ok)
|
if(ok)
|
||||||
clearChangedDiscoveredInfos();
|
clearChangedDiscoveredInfos();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue