Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 13:49:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix bug and crash in solo logic

Browse source
This commit is contained in:
Clement 2018-11-07 17:44:48 -08:00
parent 65a83cb026
commit 8f763dfd50
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assignment-client/src/audio/AudioMixerClientData.cpp
View file

@ -311,8 +311,8 @@ void AudioMixerClientData::parseSoloRequest(QSharedPointer<ReceivedMessage> mess
if (addToSolo) { if (addToSolo) {
_soloedNodes.push_back(soloedUUID); _soloedNodes.push_back(soloedUUID);
} else { } else {
auto it = std::find(std::begin(_soloedNodes), std::end(_soloedNodes), soloedUUID); auto it = std::remove(std::begin(_soloedNodes), std::end(_soloedNodes), soloedUUID);
_soloedNodes.erase(it); _soloedNodes.erase(it, std::end(_soloedNodes));
} }
} }
} }

2
libraries/audio-client/src/AudioClient.cpp
View file

@ -284,7 +284,7 @@ AudioClient::AudioClient() :
connect(&domainHandler, &DomainHandler::disconnectedFromDomain, this, [this] { connect(&domainHandler, &DomainHandler::disconnectedFromDomain, this, [this] {
_solo.reset(); _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) { if (node->getType() == NodeType::AudioMixer) {
_solo.resend(); _solo.resend();
} }