mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-29 19:45:01 +02:00
NPE fix
This commit is contained in:
parent
d56f513ea6
commit
51ad68a3b5
1 changed files with 8 additions and 4 deletions
|
@ -16,6 +16,7 @@ import java.util.Set;
|
||||||
import java.util.TreeSet;
|
import java.util.TreeSet;
|
||||||
|
|
||||||
import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
|
import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
|
||||||
|
import org.eclipse.cdt.core.settings.model.ICFileDescription;
|
||||||
import org.eclipse.cdt.core.settings.model.ICMultiItemsHolder;
|
import org.eclipse.cdt.core.settings.model.ICMultiItemsHolder;
|
||||||
import org.eclipse.cdt.core.settings.model.ICMultiResourceDescription;
|
import org.eclipse.cdt.core.settings.model.ICMultiResourceDescription;
|
||||||
import org.eclipse.cdt.core.settings.model.ICResourceDescription;
|
import org.eclipse.cdt.core.settings.model.ICResourceDescription;
|
||||||
|
@ -437,15 +438,18 @@ public class BuildStepsTab extends AbstractCBuildPropertyTab {
|
||||||
return;
|
return;
|
||||||
combo.removeAll();
|
combo.removeAll();
|
||||||
boolean prj = page.isForProject();
|
boolean prj = page.isForProject();
|
||||||
IConfiguration c = null;
|
|
||||||
ITool t = null;
|
|
||||||
if (prj || tool != null) {
|
if (prj || tool != null) {
|
||||||
for (ICConfigurationDescription cf : page.getCfgsEditable()) {
|
for (ICConfigurationDescription cf : page.getCfgsEditable()) {
|
||||||
|
IConfiguration c = null;
|
||||||
|
ITool t = null;
|
||||||
if (prj) {
|
if (prj) {
|
||||||
c = getCfg(cf);
|
c = getCfg(cf);
|
||||||
} else {
|
} else {
|
||||||
ICResourceDescription r = cf.getResourceDescription(cfgdescr.getPath(), false);
|
ICResourceDescription r = cf.getResourceDescription(cfgdescr.getPath(), true);
|
||||||
|
if (r != null && r instanceof ICFileDescription)
|
||||||
t = getRcbsTool((IFileInfo)getResCfg(r));
|
t = getRcbsTool((IFileInfo)getResCfg(r));
|
||||||
|
if (t == null)
|
||||||
|
continue; // there's no specific resconfig for this configuration
|
||||||
}
|
}
|
||||||
String s = null;
|
String s = null;
|
||||||
switch (field) {
|
switch (field) {
|
||||||
|
|
Loading…
Add table
Reference in a new issue