ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-27 20:30:32 +05:00
Code Issues Packages Projects Releases Wiki Activity

0022202: EDF SMESH: Regression in a script meshing prisms and hexaedrons

Browse Source 
Fix notifyListenersOnEvent() for the case of removing an EventListener (attempt No.2)
This commit is contained in:
eap 2013-04-29 14:18:32 +00:00
parent 36550205e6
commit 89682777f7
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/SMESH/SMESH_subMesh.cxx
View File

@ -2258,29 +2258,22 @@ void SMESH_subMesh::notifyListenersOnEvent( const int event,
const event_type eventType, const event_type eventType,
SMESH_Hypothesis* hyp) SMESH_Hypothesis* hyp)
{ {
set< EventListener* > notified; list< pair< EventListener*, EventListenerData* > > eventListeners( _eventListeners.begin(),
const size_t nbListeners = _eventListeners.size(); _eventListeners.end());
while ( notified.size() != nbListeners ) list< pair< EventListener*, EventListenerData* > >::iterator l_d = eventListeners.begin();
for ( ; l_d != eventListeners.end(); ++l_d )
{ {
map< EventListener*, EventListenerData* >::iterator l_d = _eventListeners.begin(); std::pair< EventListener*, EventListenerData* > li_da = *l_d;
for ( ; l_d != _eventListeners.end(); ++l_d ) if ( !_eventListeners.count( li_da.first )) continue;
if ( li_da.first->myBusySM.insert( this ).second )
{ {
std::pair< EventListener*, EventListenerData* > li_da = *l_d; const bool isDeletable = li_da.first->IsDeletable();
if ( notified.insert( li_da.first ).second && li_da.first->ProcessEvent( event, eventType, this, li_da.second, hyp );
li_da.first->myBusySM.insert( this ).second )
{
const bool isDeletable = li_da.first->IsDeletable();
li_da.first->ProcessEvent( event, eventType, this, li_da.second, hyp ); if ( !isDeletable || !_eventListeners.count( li_da.first ))
li_da.first->myBusySM.erase( this ); // a listener is hopefully not dead
const bool isRemoved = !_eventListeners.count( li_da.first );
if ( !isDeletable || !isRemoved )
li_da.first->myBusySM.erase( this ); // a listener is hopefully not dead
if ( isRemoved )
break; // restart looping on _eventListeners
}
} }
} }
} }