From 791a397d55b03cb237c84f11bc2a00a990d7a147 Mon Sep 17 00:00:00 2001 From: Zachary Yedidia Date: Tue, 30 Aug 2016 09:45:05 -0400 Subject: [PATCH] Fix problem with first-time creation of the settings file Fixes #219 --- cmd/micro/settings.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/cmd/micro/settings.go b/cmd/micro/settings.go index 6070e049..15f175dc 100644 --- a/cmd/micro/settings.go +++ b/cmd/micro/settings.go @@ -95,6 +95,7 @@ func WriteSettings(filename string) error { var parsed map[string]interface{} filename := configDir + "/settings.json" + parsed = globalSettings if _, e := os.Stat(filename); e == nil { input, err := ioutil.ReadFile(filename) if err != nil { @@ -105,12 +106,12 @@ func WriteSettings(filename string) error { if err != nil { TermMessage("Error reading settings.json:", err.Error()) } - } - for k, v := range parsed { - if !strings.HasPrefix(reflect.TypeOf(v).String(), "map") { - if _, ok := globalSettings[k]; ok { - parsed[k] = globalSettings[k] + for k, v := range parsed { + if !strings.HasPrefix(reflect.TypeOf(v).String(), "map") { + if _, ok := globalSettings[k]; ok { + parsed[k] = globalSettings[k] + } } } }