CHUI-120 WIP Fix for crash after closing the chat floater.

meow-7.2.2
Seth ProductEngine 2012-06-13 19:26:17 +03:00
parent 9993fa550a
commit b50349ab84
3 changed files with 12 additions and 0 deletions

View File

@ -114,6 +114,10 @@ BOOL LLIMConversation::postBuild()
BOOL LLIMConversation::tick()
{
// This check is needed until LLFloaterReg::removeInstance() is synchronized with deleting the floater
// via LLMortician::updateClass(), to avoid calling dead instances. See LLFloater::destroy().
if (isDead()) return false;
// Need to resort the participant list if it's in sort by recent speaker order.
if (mParticipantList)
{

View File

@ -487,6 +487,10 @@ void LLIMFloater::onAvatarNameCache(const LLUUID& agent_id,
// virtual
BOOL LLIMFloater::tick()
{
// This check is needed until LLFloaterReg::removeInstance() is synchronized with deleting the floater
// via LLMortician::updateClass(), to avoid calling dead instances. See LLFloater::destroy().
if (isDead()) return false;
BOOL parents_retcode = LLIMConversation::tick();
if ( mMeTyping )

View File

@ -404,6 +404,10 @@ void LLNearbyChat::showTranslationCheckbox(BOOL show)
BOOL LLNearbyChat::tick()
{
// This check is needed until LLFloaterReg::removeInstance() is synchronized with deleting the floater
// via LLMortician::updateClass(), to avoid calling dead instances. See LLFloater::destroy().
if (isDead()) return false;
BOOL parents_retcode = LLIMConversation::tick();
displaySpeakingIndicator();