diff --git a/ChangeLog b/ChangeLog
index aae8fa80e..6f864576d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-05-18  Bradley Bell  <btb@icculus.org>
 
+	* arch/sdl/digi.c: fix crash on exit if sounds are still playing
+	(d1x r1.8)
+
 	* arch/ogl/wgl.c, arch/win32/mouse.c, misc/d_io.c: Fix mismatched
 	arg types in the win32 code (d1x r1.12, r1.7, r1.2)
 
diff --git a/arch/sdl/digi.c b/arch/sdl/digi.c
index cc6788dfe..f23772f2c 100644
--- a/arch/sdl/digi.c
+++ b/arch/sdl/digi.c
@@ -1,4 +1,4 @@
-/* $Id: digi.c,v 1.14 2004-05-13 12:31:34 schaffner Exp $ */
+/* $Id: digi.c,v 1.15 2004-05-19 02:23:56 btb Exp $ */
 /*
  *
  * SDL digital audio support
@@ -200,6 +200,9 @@ static void audio_mixcallback(void *userdata, Uint8 *stream, int len)
 	Uint8 *streamend = stream + len;
 	struct sound_slot *sl;
 
+	if (!digi_initialized)
+		return;
+
 	memset(stream, 0x80, len); // fix "static" sound bug on Mac OS X
 
 	for (sl = SoundSlots; sl < SoundSlots + MAX_SOUND_SLOTS; sl++) {