Expand ~/ on Windows as well

2 files changed, 6 insertions, 2 deletions

diff --git a/cmd/syncthing/gui.go b/cmd/syncthing/gui.go
index cf997588c5..1a9ca01251 100644
--- a/cmd/syncthing/gui.go
+++ b/cmd/syncthing/gui.go
@@ -244,7 +244,7 @@ func restGetSystem(w http.ResponseWriter) {
 	res["goroutines"] = runtime.NumGoroutine()
 	res["alloc"] = m.Alloc
 	res["sys"] = m.Sys
-	res["tilde"] = expandTilde("~/")
+	res["tilde"] = expandTilde("~")
 	if cfg.Options.GlobalAnnEnabled && discoverer != nil {
 		res["extAnnounceOK"] = discoverer.ExtAnnounceOK()
 	}
diff --git a/cmd/syncthing/main.go b/cmd/syncthing/main.go
index 592275aefd..e02be4511c 100644
--- a/cmd/syncthing/main.go
+++ b/cmd/syncthing/main.go
@@ -679,7 +679,11 @@ func getDefaultConfDir() string {
 }
 
 func expandTilde(p string) string {
-	if runtime.GOOS == "windows" || !strings.HasPrefix(p, "~/") {
+	if p == "~" {
+		return getHomeDir()
+	}
+
+	if !strings.HasPrefix(p, fmt.Sprintf("~%c", os.PathSeparator)) {
 		return p
 	}