SL-14270 Crash accessing deleted 'parent' via callback from child

master
Andrey Kleshchev 2020-11-05 21:40:54 +02:00
parent 842d84b8ec
commit 281c3d8bee
2 changed files with 9 additions and 0 deletions

View File

@ -29,6 +29,11 @@
#include "llfolderviewmodel.h"
#include "lltrans.h"
LLFolderViewModelItemCommon::~LLFolderViewModelItemCommon()
{
clearChildren();
}
bool LLFolderViewModelCommon::needsSort(LLFolderViewModelItem* item)
{
return item->getSortVersion() < mTargetSortVersion;

View File

@ -248,6 +248,8 @@ public:
mChildren.clear();
}
virtual ~LLFolderViewModelItemCommon();
void requestSort() { mSortVersion = -1; }
S32 getSortVersion() { return mSortVersion; }
void setSortVersion(S32 version) { mSortVersion = version;}
@ -399,6 +401,8 @@ public:
mFolderView(NULL)
{}
virtual ~LLFolderViewModelCommon() {}
virtual void requestSortAll()
{
// sort everything