Merge pull request #3021 from Ansariel/develop_webrtc_shutdown_fix

Rye · web-flow · commit a1233239f874 · 2024-11-06T04:55:33.000-05:00
Fix shutdown crash in LLWebRTCVoiceClient
diff --git a/indra/newview/llvoicewebrtc.cpp b/indra/newview/llvoicewebrtc.cpp
@@ -303,7 +303,7 @@ void LLWebRTCVoiceClient::stopTimer()
 {
     if (mIsTimerActive)
     {
-        LLMuteList::instanceExists();
+        if (LLMuteList::instanceExists())
         {
             LLMuteList::getInstance()->removeObserver(this);
         }

Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,7 @@ void LLWebRTCVoiceClient::stopTimer()`
`303`	`303`	`{`
`304`	`304`	`if (mIsTimerActive)`
`305`	`305`	`{`
`306`		`- LLMuteList::instanceExists();`
	`306`	`+ if (LLMuteList::instanceExists())`
`307`	`307`	`{`
`308`	`308`	`LLMuteList::getInstance()->removeObserver(this);`
`309`	`309`	`}`