diff --git a/internal/config/settings.go b/internal/config/settings.go index ffa39ebb..c1ec391b 100644 --- a/internal/config/settings.go +++ b/internal/config/settings.go @@ -221,18 +221,7 @@ func OverwriteSettings(filename string) error { // RegisterCommonOptionPlug creates a new option (called pl.name). This is meant to be called by plugins to add options. func RegisterCommonOptionPlug(pl string, name string, defaultvalue interface{}) error { - name = pl + "." + name - if _, ok := GlobalSettings[name]; !ok { - defaultCommonSettings[name] = defaultvalue - GlobalSettings[name] = defaultvalue - err := WriteSettings(filepath.Join(ConfigDir, "settings.json")) - if err != nil { - return errors.New("Error writing settings.json file: " + err.Error()) - } - } else { - defaultCommonSettings[name] = defaultvalue - } - return nil + return RegisterCommonOption(pl+"."+name, defaultvalue) } // RegisterGlobalOptionPlug creates a new global-only option (named pl.name) @@ -242,31 +231,19 @@ func RegisterGlobalOptionPlug(pl string, name string, defaultvalue interface{}) // RegisterCommonOption creates a new option func RegisterCommonOption(name string, defaultvalue interface{}) error { - if v, ok := GlobalSettings[name]; !ok { - defaultCommonSettings[name] = defaultvalue + if _, ok := GlobalSettings[name]; !ok { GlobalSettings[name] = defaultvalue - err := WriteSettings(filepath.Join(ConfigDir, "settings.json")) - if err != nil { - return errors.New("Error writing settings.json file: " + err.Error()) - } - } else { - defaultCommonSettings[name] = v } + defaultCommonSettings[name] = defaultvalue return nil } // RegisterGlobalOption creates a new global-only option func RegisterGlobalOption(name string, defaultvalue interface{}) error { - if v, ok := GlobalSettings[name]; !ok { - DefaultGlobalOnlySettings[name] = defaultvalue + if _, ok := GlobalSettings[name]; !ok { GlobalSettings[name] = defaultvalue - err := WriteSettings(filepath.Join(ConfigDir, "settings.json")) - if err != nil { - return errors.New("Error writing settings.json file: " + err.Error()) - } - } else { - DefaultGlobalOnlySettings[name] = v } + DefaultGlobalOnlySettings[name] = defaultvalue return nil }