From afa6d54ac469a66ff8d8ae52c8b3456c391b47fa Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Fri, 6 Jan 2017 14:20:25 -0800 Subject: [PATCH] Actually fix the behavior... --- assignment-client/src/audio/AudioMixerSlave.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assignment-client/src/audio/AudioMixerSlave.cpp b/assignment-client/src/audio/AudioMixerSlave.cpp index 9958d95aa4..28d3358eb5 100644 --- a/assignment-client/src/audio/AudioMixerSlave.cpp +++ b/assignment-client/src/audio/AudioMixerSlave.cpp @@ -214,7 +214,7 @@ bool AudioMixerSlave::prepareMix(const SharedNodePointer& node) { bool getsAnyIgnored = nodeData->getRequestsDomainListData() && node->getCanKick(); if (otherData - && !node->isIgnoringNodeWithID(otherNode->getUUID()) + && (!node->isIgnoringNodeWithID(otherNode->getUUID()) || (otherData->getRequestsDomainListData() && otherNode->getCanKick())) && (!otherNode->isIgnoringNodeWithID(node->getUUID()) || getsAnyIgnored)) { // check to see if we're ignoring in radius @@ -256,7 +256,7 @@ bool AudioMixerSlave::prepareMix(const SharedNodePointer& node) { auto otherNodeStream = streamPair.second; bool isSelfWithEcho = ((*otherNode == *node) && (otherNodeStream->shouldLoopbackForNode())); // Add all audio streams that should be added to the mix - if (isSelfWithEcho || (!isSelfWithEcho && !insideIgnoreRadius && getsAnyIgnored)) { + if (isSelfWithEcho || (!isSelfWithEcho && !insideIgnoreRadius)) { addStreamToMix(*nodeData, otherNode->getUUID(), *nodeAudioStream, *otherNodeStream); } }