diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-30 20:36:37 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-30 20:36:37 +0000 |
| commit | 0cd5c19dedce1eca9a1054c84ea8b1392905abaa (patch) | |
| tree | 174cfeb27054b2b0a58d77d2461b0a0e557cacad /channels/chan_h323.c | |
| parent | ea0a4b792e160ba7419988721613a6998f6f857b (diff) | |
Merged revisions 152969 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r152969 | tilghman | 2008-10-30 15:35:46 -0500 (Thu, 30 Oct 2008) | 10 lines
Merged revisions 152958 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r152958 | tilghman | 2008-10-30 15:33:28 -0500 (Thu, 30 Oct 2008) | 3 lines
Cannot join detached threads. See http://www.opengroup.org/onlinepubs/000095399/functions/pthread_join.html
(Closes issue #13400)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@152974 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_h323.c')
| -rw-r--r-- | channels/chan_h323.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/channels/chan_h323.c b/channels/chan_h323.c index fc0c7f3c0..dc92e0af6 100644 --- a/channels/chan_h323.c +++ b/channels/chan_h323.c @@ -3298,11 +3298,12 @@ static int unload_module(void) } if (!ast_mutex_lock(&monlock)) { if ((monitor_thread != AST_PTHREADT_STOP) && (monitor_thread != AST_PTHREADT_NULL)) { - /* this causes a seg, anyone know why? */ - if (monitor_thread != pthread_self()) + if (monitor_thread != pthread_self()) { pthread_cancel(monitor_thread); + } pthread_kill(monitor_thread, SIGURG); - pthread_join(monitor_thread, NULL); + /* Cannot join detached threads */ + /* pthread_join(monitor_thread, NULL); */ } monitor_thread = AST_PTHREADT_STOP; ast_mutex_unlock(&monlock); |