cmd/syncthing: Fix incorrect shadowing preventing first startup (fixes #4471)

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4465

cmd/syncthing/main.go

@@ -978,7 +978,7 @@ func loadConfigAtStartup() *config.Wrapper {
 	cfgFile := locations[locConfigFile]
 	cfg, err := config.Load(cfgFile, myID)
 	if os.IsNotExist(err) {
-		cfg := defaultConfig(cfgFile)
+		cfg = defaultConfig(cfgFile)
 		cfg.Save()
 		l.Infof("Default config saved. Edit %s to taste or use the GUI\n", cfg.ConfigPath())
 	} else if err == io.EOF {

lib/model/folder.go

@@ -40,6 +40,7 @@ func newFolder(model *Model, cfg config.FolderConfiguration) folder {
 		cancel:              cancel,
 		model:               model,
 		initialScanFinished: make(chan struct{}),
+		watchCancel:         func() {},
 	}
 }
 

lib/model/rofolder.go

@@ -34,7 +34,7 @@ func (f *sendOnlyFolder) Serve() {
 		f.scan.timer.Stop()
 	}()
 
-	if f.FSWatcherEnabled {
+	if f.FSWatcherEnabled && f.CheckHealth() == nil {
 		f.startWatch()
 	}
 

lib/model/rwfolder.go

@@ -164,7 +164,7 @@ func (f *sendReceiveFolder) Serve() {
 	var prevSec int64
 	var prevIgnoreHash string
 
-	if f.FSWatcherEnabled {
+	if f.FSWatcherEnabled && f.CheckHealth() == nil {
 		f.startWatch()
 	}