livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-6511 Crash in LLFloaterView::restoreAll - exception handling

meow-7.2.2
AndreyL ProductEngine 2016-08-23 17:58:36 +03:00
parent 377683a8ed
commit b4ee80b91b
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/llui/llfloater.cpp
View File

@ -2320,7 +2320,17 @@ void LLFloaterView::restoreAll()
// make sure all subwindows aren't minimized
for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
{
LLFloater* floaterp = dynamic_cast<LLFloater*>(*child_it);
LLFloater* floaterp = nullptr;
try
{
floaterp = dynamic_cast<LLFloater*>(*child_it);
}
catch (std::exception e) // See MAINT-6511
{
LL_WARNS() << "Caught exception: " << e.what() << LL_ENDL;
continue;
}
if (floaterp)
{
floaterp->setMinimized(FALSE);