From b77c50fe58236a018336c0b5b853d4ff5f1e23bb Mon Sep 17 00:00:00 2001 From: Lynix Date: Thu, 12 Nov 2015 14:54:47 +0100 Subject: [PATCH] Network/TcpClient: Fix peer address not updated if Connect() fails Former-commit-id: 1c8f9d5e20f6266d40233e7ad0ecf7b12fee0127 --- src/Nazara/Network/TcpClient.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Nazara/Network/TcpClient.cpp b/src/Nazara/Network/TcpClient.cpp index 745c23fd6..ed9842631 100644 --- a/src/Nazara/Network/TcpClient.cpp +++ b/src/Nazara/Network/TcpClient.cpp @@ -34,8 +34,7 @@ namespace Nz } SocketState state = SocketImpl::Connect(m_handle, remoteAddress, &m_lastError); - if (state != SocketState_NotConnected) - m_peerAddress = remoteAddress; + m_peerAddress = (state != SocketState_NotConnected) ? remoteAddress : IpAddress::Invalid; UpdateState(state); return state; @@ -109,7 +108,7 @@ namespace Nz if (error == SocketError_NoError) { - // No error yet, we're still connecting or connected, check that by connecting again + // No error yet, we're still connecting or connected, check that by calling Connect again return Connect(m_peerAddress); } else @@ -243,7 +242,7 @@ namespace Nz m_peerAddress = IpAddress::Invalid; UpdateState(newState); - return m_state == SocketState_Connected; + return newState == SocketState_Connected; } case SocketState_NotConnected: