Don't reset timeout state on rejoin

ddnet · Aug 28, 2015 · d1c0551546417df011cc1f2522aa52017b584c7c · d1c0551
1 parent b743119
commit d1c0551546417df011cc1f2522aa52017b584c7c
Unified Split

Showing with 3 additions and 2 deletions.

+3 −2 src/engine/shared/network_conn.cpp
diff --git a/src/engine/shared/network_conn.cpp b/src/engine/shared/network_conn.cpp
@@ -21,11 +21,12 @@ void CNetConnection::Reset(bool Rejoin)
 	m_Sequence = 0;
 	m_Ack = 0;
 	m_RemoteClosed = 0;
-	m_TimeoutProtected = false;
-	m_TimeoutSituation = false;

 	if (!Rejoin)
 	{
+		m_TimeoutProtected = false;
+		m_TimeoutSituation = false;
+
 		m_State = NET_CONNSTATE_OFFLINE;
 		m_Token = -1;
 		m_SecurityToken = NET_SECURITY_TOKEN_UNKNOWN;