swg-source/src
1
0
Fork 0
mirror of https://github.com/SWG-Source/src.git synced 2026-09-28 15:12:53 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'testing' into clang-profile-build

Browse Source
This commit is contained in:
DarthArgus
2016-12-14 15:47:50 +00:00
parent 0ba0e141ec 5633f4be85
commit 392964fb38
2 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/shared/library/sharedNetwork/src/linux/TcpClient.cpp
+2 -2
View File
@@ -373,7 +373,7 @@ void TcpClient::queryConnect ()
pfd.fd = m_socket;
pfd.events = POLLOUT;
pfd.revents = 0;
int pollResult = poll(&pfd, 1, 0);
int pollResult = poll(&pfd, 1, 3000);
if(pollResult > 0)
{
if (pfd.revents & POLLERR)
@@ -483,7 +483,7 @@ void TcpClient::update()
pfd.fd = m_socket;
pfd.events = POLLIN|POLLHUP;
pfd.revents = 0;
int pollResult = poll (&pfd, 1, 0);
int pollResult = poll (&pfd, 1, 3000);
// POLLERR is mutually exclusive with POLLIN and POLLHUP.
// POLLIN and POLLHUP are not consistent cross-platform. Additionally,
// a POLLHUP doesn't mean that there's not data available. The best,