From: Dwayne M. Hubbard <dwayne.hubbard@gmail.com>
Date: Tue, 24 Apr 2007 19:08:28 +0000 (+0000)
Subject: removed #if 0 block from chan_zap restart_monitor()
X-Git-Tag: 1.6.0-beta1~3^2~2813
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f3ab33014a4f415c4f4ed5192bc6c87f435873eb;p=thirdparty%2Fasterisk.git

removed #if 0 block from chan_zap restart_monitor()


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

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 1563f6aa5f..acafe2d6b0 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -7308,14 +7308,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) {