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

Merge remote-tracking branch 'refs/remotes/origin/master' into enet_wip_nothing_to_see_here

This commit is contained in:
Jérôme Leclercq 2017-05-16 10:09:20 +02:00
parent 04d1d5f7d9 1cdac50af2
commit e4a9d73942
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Nazara/Network/Win32/SocketPollerImpl.cpp
View File

@ -82,7 +82,7 @@ namespace Nz
#else #else
for (std::size_t i = 0; i < 2; ++i) for (std::size_t i = 0; i < 2; ++i)
{ {
if (eventFlags & ((i == 0) ? SocketPollEvent_Read : SocketPollEvent_Write) == 0) if ((eventFlags & ((i == 0) ? SocketPollEvent_Read : SocketPollEvent_Write)) == 0)
continue; continue;
fd_set& targetSet = (i == 0) ? m_readSockets : m_writeSockets; fd_set& targetSet = (i == 0) ? m_readSockets : m_writeSockets;
@ -135,8 +135,6 @@ namespace Nz
#if NAZARA_NETWORK_POLL_SUPPORT #if NAZARA_NETWORK_POLL_SUPPORT
activeSockets = SocketImpl::Poll(m_sockets.data(), m_sockets.size(), static_cast<int>(msTimeout), error); activeSockets = SocketImpl::Poll(m_sockets.data(), m_sockets.size(), static_cast<int>(msTimeout), error);
x
#else #else
m_readyToReadSockets = m_readSockets; m_readyToReadSockets = m_readSockets;
m_readyToWriteSockets = m_writeSockets; m_readyToWriteSockets = m_writeSockets;