diff --git a/Source/Core/AudioCommon/Src/Mixer.cpp b/Source/Core/AudioCommon/Src/Mixer.cpp index 46a0fc1141..1174b48f98 100644 --- a/Source/Core/AudioCommon/Src/Mixer.cpp +++ b/Source/Core/AudioCommon/Src/Mixer.cpp @@ -27,6 +27,11 @@ void CMixer::Mix(short *samples, int numSamples) { + if (! samples) { + Premix(NULL, 0); + return; + } + // silence memset(samples, 0, numSamples * 2 * sizeof(short));