lib/syncthing: Save version to db after upgrade ops are done (ref #6457) (#6458)

lib/syncthing/syncthing.go

@@ -236,9 +236,6 @@ func (a *App) startup() error {
 		// Drop delta indexes in case we've changed random stuff we
 		// shouldn't have. We will resend our index on next connect.
 		db.DropDeltaIndexIDs(a.ll)
-
-		// Remember the new version.
-		miscDB.PutString("prevVersion", build.Version)
 	}
 
 	// Check and repair metadata and sequences on every upgrade including RCs.
@@ -249,6 +246,11 @@ func (a *App) startup() error {
 		a.ll.CheckRepair()
 	}
 
+	if build.Version != prevVersion {
+		// Remember the new version.
+		miscDB.PutString("prevVersion", build.Version)
+	}
+
 	m := model.NewModel(a.cfg, a.myID, "syncthing", build.Version, a.ll, protectedFiles, a.evLogger)
 
 	if a.opts.DeadlockTimeoutS > 0 {