From 68fb332ed12dbcd3e222f406ec7b640067564120 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Wed, 1 Jun 2022 22:49:43 +0200 Subject: [PATCH] admin: Fix segv when settings.json doesn't exist --- admin/main.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/admin/main.go b/admin/main.go index 8008d8b3..478f9761 100644 --- a/admin/main.go +++ b/admin/main.go @@ -210,17 +210,16 @@ func main() { os.MkdirAll(settings.SettingsDir, 0777) // Initialize settings and load them - var config *settings.Settings if !settings.ExistsSettings(path.Join(settings.SettingsDir, settings.SettingsFile)) { if err = api.ResetSettings(); err != nil { log.Fatal("Unable to initialize settings.json:", err) } + } + var config *settings.Settings + if config, err = settings.ReadSettings(path.Join(settings.SettingsDir, settings.SettingsFile)); err != nil { + log.Fatal("Unable to read settings.json:", err) } else { - if config, err = settings.ReadSettings(path.Join(settings.SettingsDir, settings.SettingsFile)); err != nil { - log.Fatal("Unable to read settings.json:", err) - } else { - api.ApplySettings(config) - } + api.ApplySettings(config) } // Database connection