From 8f763dfd5036384ca496b67a50d897b639191679 Mon Sep 17 00:00:00 2001 From: Clement Date: Wed, 7 Nov 2018 17:44:48 -0800 Subject: [PATCH] Fix bug and crash in solo logic --- assignment-client/src/audio/AudioMixerClientData.cpp | 4 ++-- libraries/audio-client/src/AudioClient.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assignment-client/src/audio/AudioMixerClientData.cpp b/assignment-client/src/audio/AudioMixerClientData.cpp index 3b47b058e7..68727a16be 100644 --- a/assignment-client/src/audio/AudioMixerClientData.cpp +++ b/assignment-client/src/audio/AudioMixerClientData.cpp @@ -311,8 +311,8 @@ void AudioMixerClientData::parseSoloRequest(QSharedPointer mess if (addToSolo) { _soloedNodes.push_back(soloedUUID); } else { - auto it = std::find(std::begin(_soloedNodes), std::end(_soloedNodes), soloedUUID); - _soloedNodes.erase(it); + auto it = std::remove(std::begin(_soloedNodes), std::end(_soloedNodes), soloedUUID); + _soloedNodes.erase(it, std::end(_soloedNodes)); } } } diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp index 8bc211cf9a..cab02e215e 100644 --- a/libraries/audio-client/src/AudioClient.cpp +++ b/libraries/audio-client/src/AudioClient.cpp @@ -284,7 +284,7 @@ AudioClient::AudioClient() : connect(&domainHandler, &DomainHandler::disconnectedFromDomain, this, [this] { _solo.reset(); }); - connect(nodeList.data(), &NodeList::nodeAdded, this, [this](SharedNodePointer node) { + connect(nodeList.data(), &NodeList::nodeActivated, this, [this](SharedNodePointer node) { if (node->getType() == NodeType::AudioMixer) { _solo.resend(); }