From: Mark Michelson <mmichelson@digium.com>
Date: Wed, 1 Apr 2009 13:59:34 +0000 (+0000)
Subject: Address Russell's comments regarding rev 185704.
X-Git-Tag: 11.0.0-beta1~5140
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f1707e95e5188f9788a6a9461c3640b01e381989;p=thirdparty%2Fasterisk.git

Address Russell's comments regarding rev 185704.

Use ast_debug and ast_softhangup_nolock.



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

diff --git a/main/manager.c b/main/manager.c
index 57f081ab0d..e5dbc3a92a 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -1787,13 +1787,11 @@ static int action_hangup(struct mansession *s, const struct message *m)
 		return 0;
 	}
 	if (causecode > 0) {
-		if (option_debug >= 1) {
-			ast_log(LOG_DEBUG, "Setting hangupcause of channel %s to %d (is %d now)\n",
+		ast_debug(1, "Setting hangupcause of channel %s to %d (is %d now)\n",
 				c->name, causecode, c->hangupcause);
-		}
 		c->hangupcause = causecode;
 	}
-	ast_softhangup(c, AST_SOFTHANGUP_EXPLICIT);
+	ast_softhangup_nolock(c, AST_SOFTHANGUP_EXPLICIT);
 	ast_channel_unlock(c);
 	astman_send_ack(s, m, "Channel Hungup");
 	return 0;