From 6d7c8d5759562e74aa71200185df616ffe500e2c Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Tue, 12 Jul 2016 16:11:43 -0700 Subject: [PATCH] fix crash in audio-mixer if no plugins installed --- assignment-client/src/audio/AudioMixerClientData.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/assignment-client/src/audio/AudioMixerClientData.cpp b/assignment-client/src/audio/AudioMixerClientData.cpp index 182f443225..5c2ce8bf57 100644 --- a/assignment-client/src/audio/AudioMixerClientData.cpp +++ b/assignment-client/src/audio/AudioMixerClientData.cpp @@ -348,8 +348,10 @@ void AudioMixerClientData::setupCodec(CodecPluginPointer codec, const QString& c cleanupCodec(); // cleanup any previously allocated coders first _codec = codec; _selectedCodecName = codecName; - _encoder = codec->createEncoder(AudioConstants::SAMPLE_RATE, AudioConstants::STEREO); - _decoder = codec->createDecoder(AudioConstants::SAMPLE_RATE, AudioConstants::MONO); + if (codec) { + _encoder = codec->createEncoder(AudioConstants::SAMPLE_RATE, AudioConstants::STEREO); + _decoder = codec->createDecoder(AudioConstants::SAMPLE_RATE, AudioConstants::MONO); + } auto avatarAudioStream = getAvatarAudioStream(); if (avatarAudioStream) {