github/zyedidia.micro
2
0
Fork 0
mirror of https://github.com/zyedidia/micro.git synced 2026-03-30 06:37:14 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix problem with first-time creation of the settings file

Browse Source 
Fixes #219
This commit is contained in:
Zachary Yedidia
2016-08-30 09:45:05 -04:00
parent 5df28c76e8
commit 791a397d55
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/micro/settings.go
View File

@@ -95,6 +95,7 @@ func WriteSettings(filename string) error {
var parsed map[string]interface{} var parsed map[string]interface{}
filename := configDir + "/settings.json" filename := configDir + "/settings.json"
parsed = globalSettings
if _, e := os.Stat(filename); e == nil { if _, e := os.Stat(filename); e == nil {
input, err := ioutil.ReadFile(filename) input, err := ioutil.ReadFile(filename)
if err != nil { if err != nil {
@@ -105,12 +106,12 @@ func WriteSettings(filename string) error {
if err != nil { if err != nil {
TermMessage("Error reading settings.json:", err.Error()) TermMessage("Error reading settings.json:", err.Error())
} }
}
for k, v := range parsed { for k, v := range parsed {
if !strings.HasPrefix(reflect.TypeOf(v).String(), "map") { if !strings.HasPrefix(reflect.TypeOf(v).String(), "map") {
if _, ok := globalSettings[k]; ok { if _, ok := globalSettings[k]; ok {
parsed[k] = globalSettings[k] parsed[k] = globalSettings[k]
}
} }
} }
} }