all: Use protobuf to generate config structs (fixes #6734) (#6900)

2020-08-25 08:11:14 +02:00
parent 5b953033c7
commit d507d932b8
84 changed files with 3807 additions and 542 deletions
@@ -748,7 +748,7 @@ func setupSignalHandling(app *syncthing.App) {

 func loadOrDefaultConfig(myID protocol.DeviceID, evLogger events.Logger) (config.Wrapper, error) {
 	cfgFile := locations.Get(locations.ConfigFile)
-	cfg, err := config.Load(cfgFile, myID, evLogger)
+	cfg, _, err := config.Load(cfgFile, myID, evLogger)

 	if err != nil {
 		cfg, err = syncthing.DefaultConfig(cfgFile, myID, evLogger, noDefaultFolder)