mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-24 17:35:35 +02:00
Code Issues Wiki Activity

Bug 540523 - NullPointerException in MesonPropertyPage.performOk method

Browse source 
- add check that buildConfig field has been set before performing any
  activities on it

Change-Id: If3ab7a0b20b54a9c16b26902c06b615e4c514ffa
This commit is contained in:
Jeff Johnston 2018-10-26 17:46:11 -04:00
parent 98c0500985
commit 9031090393
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
build/org.eclipse.cdt.meson.ui/src/org/eclipse/cdt/meson/ui/properties/MesonPropertyPage.java
View file

@ -299,16 +299,18 @@ public class MesonPropertyPage extends PropertyPage {
return false;
}
} else {
StringBuilder mesonargs = new StringBuilder();
for (IMesonPropertyPageControl control : componentList) {
if (!control.getUnconfiguredString().isEmpty()) {
mesonargs.append(control.getUnconfiguredString());
mesonargs.append(" "); //$NON-NLS-1$
if (buildConfig != null) {
StringBuilder mesonargs = new StringBuilder();
for (IMesonPropertyPageControl control : componentList) {
if (!control.getUnconfiguredString().isEmpty()) {
mesonargs.append(control.getUnconfiguredString());
mesonargs.append(" "); //$NON-NLS-1$
}
}
buildConfig.setProperty(IMesonConstants.MESON_ARGUMENTS, mesonargs.toString());
buildConfig.setProperty(IMesonConstants.MESON_ENV, envText.getText().trim());
buildConfig.setProperty(IMesonConstants.MESON_PROJECT_OPTIONS, projText.getText().trim());
}
buildConfig.setProperty(IMesonConstants.MESON_ARGUMENTS, mesonargs.toString());
buildConfig.setProperty(IMesonConstants.MESON_ENV, envText.getText().trim());
buildConfig.setProperty(IMesonConstants.MESON_PROJECT_OPTIONS, projText.getText().trim());
}
return true;
}