1
0

Merge branch 'master' into Inventory

This commit is contained in:
Howaner
2015-03-09 22:39:11 +01:00
77 changed files with 6381 additions and 295 deletions

View File

@@ -1895,9 +1895,13 @@ void cClientHandle::Tick(float a_Dt)
cCSLock Lock(m_CSOutgoingData);
std::swap(OutgoingData, m_OutgoingData);
}
if ((m_Link != nullptr) && !OutgoingData.empty())
if (!OutgoingData.empty())
{
m_Link->Send(OutgoingData.data(), OutgoingData.size());
cTCPLinkPtr Link(m_Link); // Grab a copy of the link in a multithread-safe way
if ((Link != nullptr))
{
Link->Send(OutgoingData.data(), OutgoingData.size());
}
}
m_TicksSinceLastPacket += 1;