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/llvoicechannel.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/llvoicechannel.cpp')
| -rw-r--r-- | indra/newview/llvoicechannel.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp index 55769f567b..cf128f381a 100644 --- a/indra/newview/llvoicechannel.cpp +++ b/indra/newview/llvoicechannel.cpp @@ -80,9 +80,8 @@ LLVoiceChannel::~LLVoiceChannel() if (sCurrentVoiceChannel == this) { sCurrentVoiceChannel = NULL; - // Must check instance exists here, the singleton MAY have already been destroyed. - LLVoiceClient::removeObserver(this); } + LLVoiceClient::removeObserver(this); sVoiceChannelMap.erase(mSessionID); } |