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

Network/Socket: Fix Connect (timeout) on Windows/Linux

This commit is contained in:
Jérôme Leclercq 2018-08-30 13:03:50 +02:00
parent d0e33225b7
commit 56873b92b0
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.md
View File

@ -141,6 +141,7 @@ Nazara Engine:
- Added SegmentCollider2D::GetThickness - Added SegmentCollider2D::GetThickness
- Fixed vertices generation/render queue submit when using multiples materials on a Tilemap - Fixed vertices generation/render queue submit when using multiples materials on a Tilemap
- It is now possible to prevent CompoundCollider2D to override individual colliders properties - It is now possible to prevent CompoundCollider2D to override individual colliders properties
- Fixed TcpClient::WaitForConnected possible failure (although connected) on Windows/Linux
Nazara Development Kit: Nazara Development Kit:
- Added ImageWidget (#139) - Added ImageWidget (#139)

2
src/Nazara/Network/Posix/SocketImpl.cpp
View File

@ -153,7 +153,7 @@ namespace Nz
tv.tv_usec = static_cast<long>((msTimeout % 1000ULL) * 1000ULL); tv.tv_usec = static_cast<long>((msTimeout % 1000ULL) * 1000ULL);
int ret = select(handle + 1, nullptr, &localSet, &localSet, (msTimeout > 0) ? &tv : nullptr); int ret = select(handle + 1, nullptr, &localSet, &localSet, (msTimeout > 0) ? &tv : nullptr);
if (ret == SOCKET_ERROR) if (ret > 0)
{ {
int code = GetLastErrorCode(handle, error); int code = GetLastErrorCode(handle, error);
if (code < 0) //< GetLastErrorCode() failed if (code < 0) //< GetLastErrorCode() failed

1
src/Nazara/Network/Win32/SocketImpl.cpp
View File

@ -132,6 +132,7 @@ namespace Nz
switch (errorCode) //< Check for "normal errors" first switch (errorCode) //< Check for "normal errors" first
{ {
case WSAEALREADY: case WSAEALREADY:
case WSAEINVAL: //< In case of connect, WSAEINVAL may be returned instead of WSAEALREADY
case WSAEWOULDBLOCK: case WSAEWOULDBLOCK:
return SocketState_Connecting; return SocketState_Connecting;