CHUI-580 : WIP : Protect callback connections passed to LLAvatarNameCache::get() where necessary

1 files changed, 5 insertions, 6 deletions

diff --git a/indra/newview/llconversationmodel.cpp b/indra/newview/llconversationmodel.cpp
index d03ad92fbc..ef9e0e02e5 100644
--- a/indra/newview/llconversationmodel.cpp
+++ b/indra/newview/llconversationmodel.cpp
@@ -421,16 +421,15 @@ LLConversationItemParticipant::~LLConversationItemParticipant()
 
 void LLConversationItemParticipant::fetchAvatarName()
 {
-	// Disconnect any previous avatar name cache connection
-	if (mAvatarNameCacheConnection.connected())
-	{
-		mAvatarNameCacheConnection.disconnect();
-	}
-
 	// Request the avatar name from the cache
 	llassert(getUUID().notNull());
 	if (getUUID().notNull())
 	{
+		// Disconnect any previous avatar name cache connection
+		if (mAvatarNameCacheConnection.connected())
+		{
+			mAvatarNameCacheConnection.disconnect();
+		}
 		mAvatarNameCacheConnection = LLAvatarNameCache::get(getUUID(), boost::bind(&LLConversationItemParticipant::onAvatarNameCache, this, _2));
 	}
 }