From c9e4c0cbf8d34beec09a97dfb764bf4b7921575b Mon Sep 17 00:00:00 2001 From: divverent Date: Fri, 18 May 2007 21:05:19 +0000 Subject: [PATCH] only memcpy the suggested format if the failure is not permanent! Otherwise, it can lead to endless loops git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7313 d7cf8633-e32d-0410-b094-e92efae38249 --- snd_coreaudio.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/snd_coreaudio.c b/snd_coreaudio.c index c10789f0..cc533991 100644 --- a/snd_coreaudio.c +++ b/snd_coreaudio.c @@ -138,14 +138,14 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested) Con_Printf("Initializing CoreAudio...\n"); - if (suggested != NULL) - memcpy (suggested, requested, sizeof (suggested)); - if(requested->width != 2) { // we can only do 16bit per sample for now if(suggested != NULL) + { + memcpy (suggested, requested, sizeof (suggested)); suggested->width = 2; + } return false; } @@ -217,6 +217,7 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested) { if (suggested != NULL) { + memcpy (suggested, requested, sizeof (suggested)); suggested->channels = streamDesc.mChannelsPerFrame; suggested->speed = streamDesc.mSampleRate; } -- 2.39.2