Don't start model until services have been added (fixes #1969)

cmd/syncthing/main.go

@@ -601,7 +601,6 @@ func syncthingMain() {
 
 	m := model.NewModel(cfg, myID, myName, "syncthing", Version, ldb)
 	cfg.Subscribe(m)
-	mainSvc.Add(m)
 
 	if t := os.Getenv("STDEADLOCKTIMEOUT"); len(t) > 0 {
 		it, err := strconv.Atoi(t)
@@ -634,6 +633,8 @@ func syncthingMain() {
 		}
 	}
 
+	mainSvc.Add(m)
+
 	// GUI
 
 	setupGUI(mainSvc, cfg, m, apiSub)