Fixed critical bug EXT-2990 (Viewer crashes after openning "Voice Control" on IM floater)

-- added disconnecting from subscribed signals while destroying participant list
-- added disconnecting from subscribed signals while destroying Voice controls
-- added nullifying of the pointer to speaker manager when channel is changed

--HG--
branch : product-engine

1 files changed, 4 insertions, 1 deletions

diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp
index 1b929eca0e..7db709086f 100644
--- a/indra/newview/llcallfloater.cpp
+++ b/indra/newview/llcallfloater.cpp
@@ -54,6 +54,7 @@ LLCallFloater::LLCallFloater(const LLSD& key)
 
 LLCallFloater::~LLCallFloater()
 {
+	mChannelChangedConnection.disconnect();
 	delete mPaticipants;
 	mPaticipants = NULL;
 }
@@ -77,7 +78,7 @@ BOOL LLCallFloater::postBuild()
 	updateSession();
 
 	// subscribe to to be notified Voice Channel is changed
-	LLVoiceChannel::setCurrentVoiceChannelChangedCallback(boost::bind(&LLCallFloater::onCurrentChannelChanged, this, _1));
+	mChannelChangedConnection = LLVoiceChannel::setCurrentVoiceChannelChangedCallback(boost::bind(&LLCallFloater::onCurrentChannelChanged, this, _1));
 	return TRUE;
 }
 
@@ -157,6 +158,8 @@ void LLCallFloater::refreshPartisipantList()
 
 void LLCallFloater::onCurrentChannelChanged(const LLUUID& /*session_id*/)
 {
+	// Forget speaker manager from the previous session to avoid using it after session was destroyed.
+	mSpeakerManager = NULL;
 	updateSession();
 }