sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Network/TcpClient: Fix peer address not updated if Connect() fails 

Former-commit-id: 1c8f9d5e20f6266d40233e7ad0ecf7b12fee0127
This commit is contained in:
Lynix 2015-11-12 14:54:47 +01:00
parent f28e1a7d9b
commit b77c50fe58
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Nazara/Network/TcpClient.cpp
View File

@ -34,8 +34,7 @@ namespace Nz
} }
SocketState state = SocketImpl::Connect(m_handle, remoteAddress, &m_lastError); SocketState state = SocketImpl::Connect(m_handle, remoteAddress, &m_lastError);
if (state != SocketState_NotConnected) m_peerAddress = (state != SocketState_NotConnected) ? remoteAddress : IpAddress::Invalid;
m_peerAddress = remoteAddress;
UpdateState(state); UpdateState(state);
return state; return state;
@ -109,7 +108,7 @@ namespace Nz
if (error == SocketError_NoError) 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); return Connect(m_peerAddress);
} }
else else
@ -243,7 +242,7 @@ namespace Nz
m_peerAddress = IpAddress::Invalid; m_peerAddress = IpAddress::Invalid;
UpdateState(newState); UpdateState(newState);
return m_state == SocketState_Connected; return newState == SocketState_Connected;
} }
case SocketState_NotConnected: case SocketState_NotConnected: