Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't compare iterator after calling erase() in ProcessPendingEvents() (replaces patch 1153906)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-03-01 01:26:34 +00:00
parent cd30330fc6
commit 7b0d5c59eb
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/common/event.cpp
View File

@@ -1123,30 +1123,28 @@ void wxEvtHandler::ProcessPendingEvents()
wxENTER_CRIT_SECT( Lock() );
// remember last event to process during this iteration
wxList::compatibility_iterator lastPendingNode = m_pendingEvents->GetLast();
wxList::compatibility_iterator node = m_pendingEvents->GetFirst();
while ( node )
// we leave the loop once we have processed all events that were present at
// the start of ProcessPendingEvents because otherwise we could get into
// infinite loop if the pending event handler execution resulted in another
// event being posted
size_t n = m_pendingEvents->size();
for ( wxList::compatibility_iterator node = m_pendingEvents->GetFirst();
node;
node = m_pendingEvents->GetFirst() )
{
wxEvent *event = (wxEvent *)node->GetData();
m_pendingEvents->Erase(node);
// In ProcessEvent, new events might get added and
// we can safely leave the crtical section here.
wxLEAVE_CRIT_SECT( Lock() );
ProcessEvent(*event);
delete event;
wxENTER_CRIT_SECT( Lock() );
// leave the loop once we have processed all events that were present
// at the start of ProcessPendingEvents because otherwise we could get
// into infinite loop if the pending event handler execution resulted
// in another event being posted
if ( node == lastPendingNode )
if ( !--n )
break;
node = m_pendingEvents->GetFirst();
}
wxLEAVE_CRIT_SECT( Lock() );