From 9c52fb7c03f09b3f09fe538709934963d420a1ca Mon Sep 17 00:00:00 2001 From: sletz Date: Tue, 30 Jun 2009 15:12:42 +0000 Subject: [PATCH] Tim Bechmann patch : hammerfall, only release monitor thread, if it has been created. git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3571 0c269be4-1314-0410-8aa9-9f06e86f4224 --- ChangeLog | 4 ++++ linux/alsa/hammerfall.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a75cb8e8..4e4cd383 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,10 @@ Paul Davis --------------------------- Jackdmp changes log --------------------------- + +2009-06-30 Stephane Letz + + * Tim Bechmann patch : hammerfall, only release monitor thread, if it has been created. 2009-06-19 Stephane Letz diff --git a/linux/alsa/hammerfall.c b/linux/alsa/hammerfall.c index 74f7941e..c2e3efea 100644 --- a/linux/alsa/hammerfall.c +++ b/linux/alsa/hammerfall.c @@ -206,8 +206,10 @@ hammerfall_release (jack_hardware_t *hw) return; } - pthread_cancel (h->monitor_thread); - pthread_join (h->monitor_thread, &status); + if (h->monitor_thread) { + pthread_cancel (h->monitor_thread); + pthread_join (h->monitor_thread, &status); + } free (h); } -- 2.11.4.GIT