From fc36e38d1ce95fc91e902732a97fa488d6111dcd Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 18 Oct 2013 10:03:02 -0700 Subject: [PATCH] fix a crash in AudioMixer with active socket but no linked data --- assignment-client/src/audio/AudioMixer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp index bf2e6ebb97..aab11b1317 100644 --- a/assignment-client/src/audio/AudioMixer.cpp +++ b/assignment-client/src/audio/AudioMixer.cpp @@ -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