From eac763ee6104072df2f666ca7cbe82c5c36f8d3a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Cl=C3=A9ment=20de=20l=27Hamaide?= Date: Thu, 26 Dec 2013 15:36:08 +0100 Subject: [PATCH] Fix frozen shutdown for Linux --- 3rdparty/iaxclient/lib/portaudio/src/hostapi/jack/pa_jack.c | 2 +- 3rdparty/iaxclient/lib/portaudio/src/os/unix/pa_unix_util.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/3rdparty/iaxclient/lib/portaudio/src/hostapi/jack/pa_jack.c b/3rdparty/iaxclient/lib/portaudio/src/hostapi/jack/pa_jack.c index 8f402bcc4..aeb1fa205 100644 --- a/3rdparty/iaxclient/lib/portaudio/src/hostapi/jack/pa_jack.c +++ b/3rdparty/iaxclient/lib/portaudio/src/hostapi/jack/pa_jack.c @@ -799,7 +799,7 @@ static void Terminate( struct PaUtilHostApiRepresentation *hostApi ) ASSERT_CALL( jack_deactivate( jackHostApi->jack_client ), 0 ); ASSERT_CALL( pthread_mutex_destroy( &jackHostApi->mtx ), 0 ); - ASSERT_CALL( pthread_cond_destroy( &jackHostApi->cond ), 0 ); + //ASSERT_CALL( pthread_cond_destroy( &jackHostApi->cond ), 0 ); ASSERT_CALL( jack_client_close( jackHostApi->jack_client ), 0 ); diff --git a/3rdparty/iaxclient/lib/portaudio/src/os/unix/pa_unix_util.c b/3rdparty/iaxclient/lib/portaudio/src/os/unix/pa_unix_util.c index 9a401e438..f26fc6fc8 100644 --- a/3rdparty/iaxclient/lib/portaudio/src/os/unix/pa_unix_util.c +++ b/3rdparty/iaxclient/lib/portaudio/src/os/unix/pa_unix_util.c @@ -388,7 +388,7 @@ PaError PaUnixThread_Terminate( PaUnixThread* self, int wait, PaError* exitResul error: PA_ASSERT_CALL( PaUnixMutex_Terminate( &self->mtx ), paNoError ); - PA_ASSERT_CALL( pthread_cond_destroy( &self->cond ), 0 ); + //PA_ASSERT_CALL( pthread_cond_destroy( &self->cond ), 0 ); return result; } -- 2.39.5