ソースを参照

Merge pull request #1322 from AudriusButkevicius/browser

Opening a browser happens in it's own routine (fixes #1273)
Jakob Borg 10 年 前
コミット
f976b78917
1 ファイル変更3 行追加1 行削除
  1. 3 1
      cmd/syncthing/main.go

+ 3 - 1
cmd/syncthing/main.go

@@ -658,7 +658,9 @@ func setupGUI(cfg *config.Wrapper, m *model.Model) {
 			}
 			if opts.StartBrowser && !noBrowser && !stRestarting {
 				urlOpen := fmt.Sprintf("%s://%s/", proto, net.JoinHostPort(hostOpen, strconv.Itoa(addr.Port)))
-				openURL(urlOpen)
+				// Can potentially block if the utility we are invoking doesn't
+				// fork, and just execs, hence keep it in it's own routine.
+				go openURL(urlOpen)
 			}
 		}
 	}