From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Thu, 30 Oct 2008 20:35:46 +0000 (+0000)
Subject: Merged revisions 152958 via svnmerge from
X-Git-Tag: 1.6.2.0-beta1~1000
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=113262874893fffbba1b3484dff2bc1ab20af8fd;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/trunk@152969 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index 7bb9238118..c2aaa2a6cc 100644
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -3316,11 +3316,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);