diff options
author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-11-01 01:29:06 +0200 |
---|---|---|
committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2024-11-01 17:54:05 +0200 |
commit | 0114be2c155ed5a3de17f6b49d06fab607b9d6bf (patch) | |
tree | bdd1ee334c90b017403215bf874ed443dd75fc6f /indra/newview/llspeakingindicatormanager.cpp | |
parent | cbd713037e5636b9f3c360332e23e0e29d2972ce (diff) |
viewer#2985 Odd crash when notifying voice observers
Crash points at enableDisableCallBtn, but button's floater was cleaned
earlier and has a removeObserver call so an observer record should be
long gone. Likely something else is going on.
Went over various callbacks and made sure they are cleaned. But in case
floater somehow remained, added mSession = nullptr.
Diffstat (limited to 'indra/newview/llspeakingindicatormanager.cpp')
-rw-r--r-- | indra/newview/llspeakingindicatormanager.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llspeakingindicatormanager.cpp b/indra/newview/llspeakingindicatormanager.cpp index a9ef5e244d..532b245ced 100644 --- a/indra/newview/llspeakingindicatormanager.cpp +++ b/indra/newview/llspeakingindicatormanager.cpp @@ -133,6 +133,8 @@ private: * @see onChange() */ speaker_ids_t mSwitchedIndicatorsOn; + + boost::signals2::connection mVoiceChannelChanged; }; ////////////////////////////////////////////////////////////////////////// @@ -181,7 +183,7 @@ void SpeakingIndicatorManager::unregisterSpeakingIndicator(const LLUUID& speaker ////////////////////////////////////////////////////////////////////////// SpeakingIndicatorManager::SpeakingIndicatorManager() { - LLVoiceChannel::setCurrentVoiceChannelChangedCallback(boost::bind(&SpeakingIndicatorManager::sOnCurrentChannelChanged, this, _1)); + mVoiceChannelChanged = LLVoiceChannel::setCurrentVoiceChannelChangedCallback(boost::bind(&SpeakingIndicatorManager::sOnCurrentChannelChanged, this, _1)); LLVoiceClient::addObserver(this); } |