From: Richard Mudgett <rmudgett@digium.com>
Date: Wed, 5 Jun 2013 23:29:43 +0000 (+0000)
Subject: Make local channels use ast_channel_move() instead of the inlined version.
X-Git-Tag: 13.0.0-beta1~1727
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7e7d7759b9eb7a47950fd9e4cd44e1262b389a1;p=thirdparty%2Fasterisk.git

Make local channels use ast_channel_move() instead of the inlined version.

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

diff --git a/main/core_local.c b/main/core_local.c
index 2e0bcc48ae..5c7a34f1f5 100644
--- a/main/core_local.c
+++ b/main/core_local.c
@@ -445,9 +445,8 @@ static int local_call(struct ast_channel *ast, const char *dest, int timeout)
 	case LOCAL_CALL_ACTION_MASQUERADE:
 		local_bridge_event(p);
 		ast_answer(chan);
-		res = ast_channel_masquerade(p->action.masq, chan);
+		res = ast_channel_move(p->action.masq, chan);
 		if (!res) {
-			ast_do_masquerade(p->action.masq);
 			/* Chan is now an orphaned zombie.  Destroy it. */
 			ast_hangup(chan);
 		}