summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeth ProductEngine <slitovchuk@productengine.com>2011-12-12 13:32:23 +0200
committerSeth ProductEngine <slitovchuk@productengine.com>2011-12-12 13:32:23 +0200
commit6114ce2d27a3c776a59d1f09ad05d9b2f100a35d (patch)
treefa16efef514079e1dba7e53fbc5b29c9fc02f506
parent702410cef75e0cc10258964b86b093f2205ef462 (diff)
EXP-1672 FIXED Added check for LLChicletBar instance existence not to create a new one when viewer exits.
Could not reproduce the crash. This is a possible fix for EXP-1672. The message before the crash in all client logs was: "WARNING: LLSingleton<class LLChicletBar>::getInstance: Trying to access deleted singleton class LLChicletBar creating new instance"
-rw-r--r--indra/newview/llchiclet.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp
index a076374903..9626b93690 100644
--- a/indra/newview/llchiclet.cpp
+++ b/indra/newview/llchiclet.cpp
@@ -296,6 +296,13 @@ void LLIMWellChiclet::createMenu()
void LLIMWellChiclet::messageCountChanged(const LLSD& session_data)
{
+ // The singleton class LLChicletBar instance might be already deleted
+ // so don't create a new one.
+ if (!LLChicletBar::instanceExists())
+ {
+ return;
+ }
+
const LLUUID& session_id = session_data["session_id"];
const S32 counter = LLChicletBar::getInstance()->getTotalUnreadIMCount();
const bool im_not_visible = !LLFloaterReg::instanceVisible("im_container")