From 8661afcb4f0cbbaf48d8236a49255182599ac2ca Mon Sep 17 00:00:00 2001
From: Jakob Borg <jakob@nym.se>
Date: Sat, 24 May 2014 13:22:09 +0200
Subject: [PATCH] Expand ~/ on Windows as well

---
 cmd/syncthing/gui.go  | 2 +-
 cmd/syncthing/main.go | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/cmd/syncthing/gui.go b/cmd/syncthing/gui.go
index cf997588c..1a9ca0125 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 592275aef..e02be4511 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
 	}