mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2024-11-23 12:49:45 +00:00
Merge remote-tracking branch 'origin/GP-2218_ghidra1_MultipleDataSettingsNPE'
This commit is contained in:
commit
fa9f57a4d4
@ -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();
|
||||
|
Loading…
Reference in New Issue
Block a user