From f4a1f1c7e133fc6cf3967c91a903ac1655e997a2 Mon Sep 17 00:00:00 2001 From: nakeee Date: Thu, 26 Mar 2009 10:50:52 +0000 Subject: [PATCH] crash fix git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2758 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/AudioCommon/Src/Mixer.cpp | 5 +++++ 1 file changed, 5 insertions(+) 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));