admin: Fix segv when settings.json doesn't exist
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
parent
595318e7b1
commit
68fb332ed1
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user