From 5ddeb7659e6dc4d8b7f843a41a518eca40e6e9a6 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Thu, 27 Apr 2023 17:36:37 -0400
Subject: [PATCH] Leaky signal connections are leaky
---
indra/llui/lluictrl.cpp | 6 ++++++
indra/newview/llfloaterspellchecksettings.cpp | 4 +++-
indra/newview/llfloaterspellchecksettings.h | 3 +++
indra/newview/llvoicevivox.cpp | 12 ++++++++----
indra/newview/llvoicevivox.h | 6 +++++-
5 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp
index cbf8eb07258..268d9dd4079 100644
--- a/indra/llui/lluictrl.cpp
+++ b/indra/llui/lluictrl.cpp
@@ -249,6 +249,12 @@ LLUICtrl::~LLUICtrl()
gFocusMgr.removeTopCtrlWithoutCallback( this );
}
+ mControlConnection.disconnect();
+ mEnabledControlConnection.disconnect();
+ mDisabledControlConnection.disconnect();
+ mMakeVisibleControlConnection.disconnect();
+ mMakeInvisibleControlConnection.disconnect();
+
delete mCommitSignal;
delete mValidateSignal;
delete mMouseEnterSignal;
diff --git a/indra/newview/llfloaterspellchecksettings.cpp b/indra/newview/llfloaterspellchecksettings.cpp
index 32eb70cd39e..0fa1d4b0a4b 100644
--- a/indra/newview/llfloaterspellchecksettings.cpp
+++ b/indra/newview/llfloaterspellchecksettings.cpp
@@ -63,7 +63,7 @@ void LLFloaterSpellCheckerSettings::draw()
BOOL LLFloaterSpellCheckerSettings::postBuild(void)
{
- gSavedSettings.getControl("SpellCheck")->getSignal()->connect(boost::bind(&LLFloaterSpellCheckerSettings::refreshDictionaries, this, false));
+ mSpellcheckCtrlConnection = gSavedSettings.getControl("SpellCheck")->getSignal()->connect(boost::bind(&LLFloaterSpellCheckerSettings::refreshDictionaries, this, false));
LLSpellChecker::setSettingsChangeCallback(boost::bind(&LLFloaterSpellCheckerSettings::onSpellCheckSettingsChange, this));
getChild<LLUICtrl>("spellcheck_remove_btn")->setCommitCallback(boost::bind(&LLFloaterSpellCheckerSettings::onBtnRemove, this));
getChild<LLUICtrl>("spellcheck_import_btn")->setCommitCallback(boost::bind(&LLFloaterSpellCheckerSettings::onBtnImport, this));
@@ -101,6 +101,8 @@ void LLFloaterSpellCheckerSettings::onBtnMove(const std::string& from, const std
void LLFloaterSpellCheckerSettings::onClose(bool app_quitting)
{
+ mSpellcheckCtrlConnection.disconnect();
+
if (app_quitting)
{
// don't save anything
diff --git a/indra/newview/llfloaterspellchecksettings.h b/indra/newview/llfloaterspellchecksettings.h
index 200cbb203de..e667dadf518 100644
--- a/indra/newview/llfloaterspellchecksettings.h
+++ b/indra/newview/llfloaterspellchecksettings.h
@@ -45,6 +45,9 @@ class LLFloaterSpellCheckerSettings final : public LLFloater
void onBtnRemove();
void onSpellCheckSettingsChange();
void refreshDictionaries(bool from_settings);
+
+private:
+ boost::signals2::connection mSpellcheckCtrlConnection;
};
class LLFloaterSpellCheckerImport final : public LLFloater
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index bed79022cd7..bde67d6e038 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -385,6 +385,10 @@ LLVivoxVoiceClient::~LLVivoxVoiceClient()
{
mAvatarNameCacheConnection.disconnect();
}
+ mVivoxVadAutoCon.disconnect();
+ mVivoxVadAHangoverCon.disconnect();
+ mVivoxVadNoiseCon.disconnect();
+ mVivoxVadSensitivityCon.disconnect();
sShuttingDown = true;
}
@@ -854,10 +858,10 @@ void LLVivoxVoiceClient::voiceControlStateMachine(S32 &coro_state)
setupVADParams(vad_auto, vad_hangover, vad_noise_floor, vad_sensitivity);
// watch for changes to the VAD settings via Debug Settings UI and act on them accordingly
- gSavedSettings.getControl("VivoxVadAuto")->getSignal()->connect(boost::bind(&LLVivoxVoiceClient::onVADSettingsChange, this));
- gSavedSettings.getControl("VivoxVadHangover")->getSignal()->connect(boost::bind(&LLVivoxVoiceClient::onVADSettingsChange, this));
- gSavedSettings.getControl("VivoxVadNoiseFloor")->getSignal()->connect(boost::bind(&LLVivoxVoiceClient::onVADSettingsChange, this));
- gSavedSettings.getControl("VivoxVadSensitivity")->getSignal()->connect(boost::bind(&LLVivoxVoiceClient::onVADSettingsChange, this));
+ mVivoxVadAutoCon = gSavedSettings.getControl("VivoxVadAuto")->getSignal()->connect(boost::bind(&LLVivoxVoiceClient::onVADSettingsChange, this));
+ mVivoxVadAHangoverCon = gSavedSettings.getControl("VivoxVadHangover")->getSignal()->connect(boost::bind(&LLVivoxVoiceClient::onVADSettingsChange, this));
+ mVivoxVadNoiseCon = gSavedSettings.getControl("VivoxVadNoiseFloor")->getSignal()->connect(boost::bind(&LLVivoxVoiceClient::onVADSettingsChange, this));
+ mVivoxVadSensitivityCon = gSavedSettings.getControl("VivoxVadSensitivity")->getSignal()->connect(boost::bind(&LLVivoxVoiceClient::onVADSettingsChange, this));
if (mTuningMode)
{
diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h
index eb99ae66b9c..7b4c71bedae 100644
--- a/indra/newview/llvoicevivox.h
+++ b/indra/newview/llvoicevivox.h
@@ -604,7 +604,11 @@ class LLVivoxVoiceClient final : public LLSingleton<LLVivoxVoiceClient>,
void avatarNameResolved(const LLUUID &id, const std::string &name);
static void predAvatarNameResolution(const LLVivoxVoiceClient::sessionStatePtr_t &session, LLUUID id, std::string name);
- boost::signals2::connection mAvatarNameCacheConnection;
+ boost::signals2::scoped_connection mAvatarNameCacheConnection;
+ boost::signals2::scoped_connection mVivoxVadAutoCon;
+ boost::signals2::scoped_connection mVivoxVadAHangoverCon;
+ boost::signals2::scoped_connection mVivoxVadNoiseCon;
+ boost::signals2::scoped_connection mVivoxVadSensitivityCon;
/////////////////////////////
// Voice fonts
--
GitLab