]> git.mxchange.org Git - flightgear.git/commitdiff
Fix frozen shutdown for Linux
authorClément de l'Hamaide <clemaez@hotmail.fr>
Thu, 26 Dec 2013 14:36:08 +0000 (15:36 +0100)
committerClément de l'Hamaide <clemaez@hotmail.fr>
Thu, 26 Dec 2013 14:36:08 +0000 (15:36 +0100)
3rdparty/iaxclient/lib/portaudio/src/hostapi/jack/pa_jack.c
3rdparty/iaxclient/lib/portaudio/src/os/unix/pa_unix_util.c

index 8f402bcc430a62d011025a6368e4245a8434d2e4..aeb1fa205679ddc7bcc9288ead8f244b303be0bf 100644 (file)
@@ -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 );
 
index 9a401e438a006a6a186e0f367798d8de3359419b..f26fc6fc85d32cd8921534864a6a02f594173f1f 100644 (file)
@@ -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;
 }