Perform tilde expansion in the config wrapper

cmd/syncthing/main.go

@@ -575,17 +575,11 @@ func setupGUI(cfg *config.ConfigWrapper, m *model.Model) {
 }
 
 func sanityCheckFolders(cfg *config.ConfigWrapper, m *model.Model) {
-	var err error
-
 nextFolder:
 	for id, folder := range cfg.Folders() {
 		if folder.Invalid != "" {
 			continue
 		}
-		folder.Path, err = osutil.ExpandTilde(folder.Path)
-		if err != nil {
-			l.Fatalln("home:", err)
-		}
 		m.AddFolder(folder)
 
 		fi, err := os.Stat(folder.Path)

internal/config/config.go

@@ -377,7 +377,7 @@ func convertV5V6(cfg *Configuration) {
 	// Added ".stfolder" file at folder roots to identify mount issues
 	// Doesn't affect the config itself, but uses config migrations to identify
 	// the migration point.
-	for _, folder := range cfg.Folders {
+	for _, folder := range Wrap("", *cfg).Folders() {
 		err := folder.CreateMarker()
 		if err != nil {
 			panic(err)

internal/config/wrapper.go

@@ -167,6 +167,12 @@ func (w *ConfigWrapper) Folders() map[string]FolderConfiguration {
 	if w.folderMap == nil {
 		w.folderMap = make(map[string]FolderConfiguration, len(w.cfg.Folders))
 		for _, fld := range w.cfg.Folders {
+			path, err := osutil.ExpandTilde(fld.Path)
+			if err != nil {
+				l.Warnln("home:", err)
+				continue
+			}
+			fld.Path = path
 			w.folderMap[fld.ID] = fld
 		}
 	}