Fix default setting for global & common options
Apply the same fix as 4d13308
to all kinds of options, not just to
plugin options.
This commit is contained in:
parent
d8e9d61a95
commit
c791cef9c6
1 changed files with 4 additions and 4 deletions
|
@ -239,7 +239,7 @@ 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 {
|
||||
if _, ok := GlobalSettings[name]; !ok {
|
||||
defaultCommonSettings[name] = defaultvalue
|
||||
GlobalSettings[name] = defaultvalue
|
||||
err := WriteSettings(filepath.Join(ConfigDir, "settings.json"))
|
||||
|
@ -247,14 +247,14 @@ func RegisterCommonOption(name string, defaultvalue interface{}) error {
|
|||
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 {
|
||||
if _, ok := GlobalSettings[name]; !ok {
|
||||
DefaultGlobalOnlySettings[name] = defaultvalue
|
||||
GlobalSettings[name] = defaultvalue
|
||||
err := WriteSettings(filepath.Join(ConfigDir, "settings.json"))
|
||||
|
@ -262,7 +262,7 @@ func RegisterGlobalOption(name string, defaultvalue interface{}) error {
|
|||
return errors.New("Error writing settings.json file: " + err.Error())
|
||||
}
|
||||
} else {
|
||||
DefaultGlobalOnlySettings[name] = v
|
||||
DefaultGlobalOnlySettings[name] = defaultvalue
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue