Merge remote-tracking branch 'origin/GP-2218_ghidra1_MultipleDataSettingsNPE'

This commit is contained in:
ghidra1 2022-06-22 11:19:20 -04:00
commit fa9f57a4d4

View File

@ -70,7 +70,8 @@ public abstract class AbstractSettingsDialog extends DialogComponentProvider {
this.settingsDefinitions = settingDefinitions;
settings = new SettingsImpl(originalSettings) {
public boolean isChangeAllowed(SettingsDefinition settingsDefinition) {
return originalSettings.isChangeAllowed(settingsDefinition);
return originalSettings == null ||
originalSettings.isChangeAllowed(settingsDefinition);
}
};
defaultSettings = settings.getDefaultSettings();