From: Matt Joiner <anacrolix@gmail.com>
Date: Wed, 16 Aug 2017 00:32:25 +0000 (+1000)
Subject: Some tidying in Client.dialFirst
X-Git-Tag: v1.0.0~449
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=2d59d4801582b2c1a652310ab3f5aad05ff35c72;p=btrtrc.git

Some tidying in Client.dialFirst
---

diff --git a/client.go b/client.go
index b47b4db8..4e40197a 100644
--- a/client.go
+++ b/client.go
@@ -543,17 +543,13 @@ func (cl *Client) dialFirst(addr string, t *Torrent) (conn net.Conn, utp bool) {
 	// Initiate connections via TCP and UTP simultaneously. Use the first one
 	// that succeeds.
 	left := 0
-	if !cl.config.DisableUTP {
-		left++
-	}
-	if !cl.config.DisableTCP {
-		left++
-	}
 	resCh := make(chan dialResult, left)
 	if !cl.config.DisableUTP {
+		left++
 		go doDial(cl.dialUTP, resCh, true, addr, t)
 	}
 	if !cl.config.DisableTCP {
+		left++
 		go doDial(cl.dialTCP, resCh, false, addr, t)
 	}
 	var res dialResult