Merge pull request #1087 from birarda/assignment

fix a crash in AudioMixer with active socket but no linked data
This commit is contained in:
ZappoMan 2013-10-18 10:09:38 -07:00
commit 10b7110218

View file

@ -163,7 +163,7 @@ void AudioMixer::run() {
const int PHASE_DELAY_AT_90 = 20;
if (node->getType() == NODE_TYPE_AGENT && node->getActiveSocket()) {
if (node->getType() == NODE_TYPE_AGENT && node->getActiveSocket() && node->getLinkedData()) {
AvatarAudioRingBuffer* nodeRingBuffer = (AvatarAudioRingBuffer*) node->getLinkedData();
// zero out the client mix for this node