Always run relaying when enabled (fixes #2665)

2016-01-12 14:15:47 +01:00
parent 1e45111bde
commit f741066466
3 changed files with 1 additions and 4 deletions
--- a/cmd/syncthing/main.go
+++ b/cmd/syncthing/main.go
@@ -738,7 +738,7 @@ func syncthingMain(runtimeOptions RuntimeOptions) {
 	// Start relay management

 	var relayService *relay.Service
-	if opts.RelaysEnabled && (opts.GlobalAnnEnabled || opts.RelayWithoutGlobalAnn) {
+	if opts.RelaysEnabled {
 		relayService = relay.NewService(cfg, tlsCfg)
 		mainService.Add(relayService)
 	}