TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-19 14:43:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1548 from Azaezel/alpha41/eventManagerSafeties

Browse source 
reformulation of subscriber message consumer
This commit is contained in:
Areloch 2025-09-12 00:46:56 -05:00 • committed by GitHub
commit d7d64fdd9f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 26 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Engine/source/util/messaging/eventManager.cpp
View file

@ -79,24 +79,26 @@ bool EventManagerListener::onMessageReceived( StringTableEntry queue, const char
if( subscribers == NULL )
return true;
for( Vector<Subscriber>::iterator iter = subscribers->begin(); iter != subscribers->end(); iter++ )
for (U32 i = 0; i < subscribers->size(); i++)
{
if( iter->listener == NULL )
Subscriber* itter = &((*subscribers)[i]);
if (itter->listener == NULL)
{
subscribers->erase_fast( iter -- );
continue;
(*subscribers).erase(i);
}
else if (!itter->removeFlag)
{
itter->callDepth++;
Con::executef(itter->listener, itter->callback, data);
itter->callDepth--;
if (itter->removeFlag && itter->callDepth == 0)
{
(*subscribers).erase(i);
}
}
if (!iter->removeFlag)
{
iter->callDepth++;
Con::executef( iter->listener, iter->callback, data );
iter->callDepth--;
if (iter->removeFlag && iter->callDepth==0)
{
subscribers->erase_fast(iter--);
}
}
if (subscribers->size() == 0)
return true;
}
return true;