Skip to content
Snippets Groups Projects
Commit 0f1d337a authored by Kitty Barnett's avatar Kitty Barnett
Browse files

STORM-799 FIXED Crash in LLVivoxVoiceClient::notifyStatusObservers()

parent fb8ba158
No related branches found
No related tags found
No related merge requests found
...@@ -341,10 +341,11 @@ LLPanelAvatarNotes::~LLPanelAvatarNotes() ...@@ -341,10 +341,11 @@ LLPanelAvatarNotes::~LLPanelAvatarNotes()
if(getAvatarId().notNull()) if(getAvatarId().notNull())
{ {
LLAvatarTracker::instance().removeParticularFriendObserver(getAvatarId(), this); LLAvatarTracker::instance().removeParticularFriendObserver(getAvatarId(), this);
if(LLVoiceClient::instanceExists()) }
{
LLVoiceClient::getInstance()->removeObserver((LLVoiceClientStatusObserver*)this); if(LLVoiceClient::instanceExists())
} {
LLVoiceClient::getInstance()->removeObserver((LLVoiceClientStatusObserver*)this);
} }
} }
...@@ -758,10 +759,11 @@ LLPanelAvatarProfile::~LLPanelAvatarProfile() ...@@ -758,10 +759,11 @@ LLPanelAvatarProfile::~LLPanelAvatarProfile()
if(getAvatarId().notNull()) if(getAvatarId().notNull())
{ {
LLAvatarTracker::instance().removeParticularFriendObserver(getAvatarId(), this); LLAvatarTracker::instance().removeParticularFriendObserver(getAvatarId(), this);
if(LLVoiceClient::instanceExists()) }
{
LLVoiceClient::getInstance()->removeObserver((LLVoiceClientStatusObserver*)this); if(LLVoiceClient::instanceExists())
} {
LLVoiceClient::getInstance()->removeObserver((LLVoiceClientStatusObserver*)this);
} }
} }
......
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