1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-22 06:02:11 +02:00

Bug 540523 - NullPointerException in MesonPropertyPage.performOk method

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

Change-Id: If3ab7a0b20b54a9c16b26902c06b615e4c514ffa
(cherry picked from commit 9031090393)
This commit is contained in:
Jeff Johnston 2018-10-26 17:46:11 -04:00
parent 08721bdf8e
commit 26bdf7e82f

View file

@ -299,6 +299,7 @@ public class MesonPropertyPage extends PropertyPage {
return false;
}
} else {
if (buildConfig != null) {
StringBuilder mesonargs = new StringBuilder();
for (IMesonPropertyPageControl control : componentList) {
if (!control.getUnconfiguredString().isEmpty()) {
@ -310,6 +311,7 @@ public class MesonPropertyPage extends PropertyPage {
buildConfig.setProperty(IMesonConstants.MESON_ENV, envText.getText().trim());
buildConfig.setProperty(IMesonConstants.MESON_PROJECT_OPTIONS, projText.getText().trim());
}
}
return true;
}
/**