diff options
| author | Richard Linden <none@none> | 2012-01-03 09:41:16 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-03 09:41:16 -0800 |
| commit | 3861249a749c99c2a7b05d15ef82f8ff21453d05 (patch) | |
| tree | dcc087fe66d15634fde03e7a4bfaf5b8c7c0dab6 /indra/newview/llfolderview.cpp | |
| parent | 0c0ff35d19969cc762dce510a4d5ee4649d96a24 (diff) | |
use lazy deletion of views via die() method to avoid some potential crashes
Diffstat (limited to 'indra/newview/llfolderview.cpp')
| -rw-r--r-- | indra/newview/llfolderview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 6ec2598e44..20fe85472f 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -299,7 +299,7 @@ LLFolderView::~LLFolderView( void ) mAutoOpenItems.removeAllNodes(); gIdleCallbacks.deleteFunction(idle, this); - delete mPopupMenuHandle.get(); + if (mPopupMenuHandle.get()) mPopupMenuHandle.get()->die(); mAutoOpenItems.removeAllNodes(); clearSelection(); @@ -1969,7 +1969,7 @@ BOOL LLFolderView::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, void LLFolderView::deleteAllChildren() { closeRenamer(); - delete mPopupMenuHandle.get(); + if (mPopupMenuHandle.get()) mPopupMenuHandle.get()->die(); mPopupMenuHandle = LLHandle<LLView>(); mScrollContainer = NULL; mRenameItem = NULL; |