Skip to content
Snippets Groups Projects
Commit 99605aa7 authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Fix potential crash

parent 9ddb1cde
No related branches found
No related tags found
2 merge requests!3Update to main branch,!2Rebase onto current main branch
......@@ -996,12 +996,14 @@ void LLFloaterIMContainer::onAddButtonClicked()
{
LLView * button = findChild<LLView>("conversations_pane_buttons_expanded")->findChild<LLButton>("add_btn");
LLFloater* root_floater = gFloaterView->getParentFloater(this);
LLFloaterAvatarPicker* picker = LLFloaterAvatarPicker::show(boost::bind(&LLFloaterIMContainer::onAvatarPicked, this, _1), TRUE, TRUE, TRUE, root_floater->getName(), button);
if (picker && root_floater)
{
root_floater->addDependentFloater(picker);
}
if (root_floater)
{
LLFloaterAvatarPicker* picker = LLFloaterAvatarPicker::show(boost::bind(&LLFloaterIMContainer::onAvatarPicked, this, _1), TRUE, TRUE, TRUE, root_floater->getName(), button);
if (picker)
{
root_floater->addDependentFloater(picker);
}
}
}
void LLFloaterIMContainer::onAvatarPicked(const uuid_vec_t& ids)
......
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