Skip to content
Snippets Groups Projects
Commit 2f12e96e authored by maxim_productengine's avatar maxim_productengine
Browse files

SL-10013 Crash in LLFolderViewModelItemInventory::filterChildItem(..)

parent 23356ac0
No related branches found
No related tags found
No related merge requests found
...@@ -181,24 +181,26 @@ bool LLFolderViewModelItemInventory::filterChildItem( LLFolderViewModelItem* ite ...@@ -181,24 +181,26 @@ bool LLFolderViewModelItemInventory::filterChildItem( LLFolderViewModelItem* ite
S32 filter_generation = filter.getCurrentGeneration(); S32 filter_generation = filter.getCurrentGeneration();
bool continue_filtering = true; bool continue_filtering = true;
if (item->getLastFilterGeneration() < filter_generation) if (item)
{ {
// Recursive application of the filter for child items (CHUI-849) if (item->getLastFilterGeneration() < filter_generation)
continue_filtering = item->filter( filter ); {
} // Recursive application of the filter for child items (CHUI-849)
continue_filtering = item->filter(filter);
}
// Update latest generation to pass filter in parent and propagate up to root // Update latest generation to pass filter in parent and propagate up to root
if (item->passedFilter()) if (item->passedFilter())
{
LLFolderViewModelItemInventory* view_model = this;
while(view_model && view_model->mMostFilteredDescendantGeneration < filter_generation)
{ {
view_model->mMostFilteredDescendantGeneration = filter_generation; LLFolderViewModelItemInventory* view_model = this;
view_model = static_cast<LLFolderViewModelItemInventory*>(view_model->mParent);
while (view_model && view_model->mMostFilteredDescendantGeneration < filter_generation)
{
view_model->mMostFilteredDescendantGeneration = filter_generation;
view_model = static_cast<LLFolderViewModelItemInventory*>(view_model->mParent);
}
} }
} }
return continue_filtering; return continue_filtering;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment