merged RC_1_1 into master

2018-11-29 10:29:56 +01:00 · 2018-11-29 10:29:56 +01:00 · fb66419791
parent 4e2f013704 a44ddddede
commit fb66419791
1 changed files with 4 additions and 1 deletions
--- a/src/bt_peer_connection.cpp
+++ b/src/bt_peer_connection.cpp
@ -1217,7 +1217,10 @@ namespace {
 		if (!m_supports_dht_port)
 		{
 			m_supports_dht_port = true;
-			write_dht_port();
+			// if we're done with the handshake, respond right away, otherwise
+			// we'll send the DHT port later
+			if (m_sent_handshake)
+				write_dht_port();
 		}
 	}