Merge branch 'development' into EngineAPI-Refactor

This commit is contained in:
Areloch 2018-12-09 14:48:50 -06:00 committed by GitHub
commit 6cf0c9e360
1933 changed files with 102328 additions and 70545 deletions

View file

@ -1301,7 +1301,7 @@ static void processPingsAndQueries( U32 session, bool schedule )
if ( !gPingList.size() && !waitingForMaster )
{
// Start the query phase:
for ( U32 i = 0; i < gQueryList.size() && i < gMaxConcurrentQueries; )
for ( i = 0; i < gQueryList.size() && i < gMaxConcurrentQueries; )
{
Ping &p = gQueryList[i];
if ( p.time + gPingTimeout < time )