fic/server
2
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

admin: Fix segv when settings.json doesn't exist
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
nemunaire 2022-06-01 22:49:43 +02:00
parent 595318e7b1
commit 68fb332ed1
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
admin/main.go
View File

@ -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