From: Dwayne M. Hubbard <dwayne.hubbard@gmail.com>
Date: Tue, 24 Apr 2007 18:43:53 +0000 (+0000)
Subject: Merged revisions 61777 via svnmerge from
X-Git-Tag: 1.4.7.1~413
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=db556150904fcd1bf8c44f2179aad71482d352ea;p=thirdparty%2Fasterisk.git

Merged revisions 61777 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r61777 | dhubbard | 2007-04-24 13:20:31 -0500 (Tue, 24 Apr 2007) | 1 line

removed #if 0 block from chan_phone, chan_zap, and chan_modem restart_monitor()
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@61779 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index f988c7c337..5e7ead08e0 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -6932,14 +6932,8 @@ static int restart_monitor(void)
 		return -1;
 	}
 	if (monitor_thread != AST_PTHREADT_NULL) {
-		/* Just signal it to be sure it wakes up */
-#if 0
-		pthread_cancel(monitor_thread);
-#endif
+		/* Wake up the thread */
 		pthread_kill(monitor_thread, SIGURG);
-#if 0
-		pthread_join(monitor_thread, NULL);
-#endif
 	} else {
 		/* Start a new monitor */
 		if (ast_pthread_create_background(&monitor_thread, &attr, do_monitor, NULL) < 0) {