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

remove the object from wxPendingDelete list before deleting it to avoid infinite loop if DeletePendingObject() is reentered from object dtor

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-08-25 15:49:11 +00:00
parent 449210a44c
commit 73865dad6e
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/appcmn.cpp
View File

@@ -366,11 +366,14 @@ void wxAppBase::DeletePendingObjects()
{ {
wxObject *obj = node->GetData(); wxObject *obj = node->GetData();
delete obj; // remove it from the list first so that if we get back here somehow
// during the object deletion (e.g. wxYield called from its dtor) we
if (wxPendingDelete.Member(obj)) // wouldn't try to delete it the second time
if ( wxPendingDelete.Member(obj) )
wxPendingDelete.Erase(node); wxPendingDelete.Erase(node);
delete obj;
// Deleting one object may have deleted other pending // Deleting one object may have deleted other pending
// objects, so start from beginning of list again. // objects, so start from beginning of list again.
node = wxPendingDelete.GetFirst(); node = wxPendingDelete.GetFirst();