[asterisk-commits] rmudgett: branch rmudgett/hangup_handlers r369281 - /team/rmudgett/hangup_han...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri Jun 22 18:52:52 2012
New Revision: 369281

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=369281
Log:
Restore app Bridge always continuing in the dialplan.

Modified:
    team/rmudgett/hangup_handlers/main/features.c

Modified: team/rmudgett/hangup_handlers/main/features.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/hangup_handlers/main/features.c?view=diff&rev=369281&r1=369280&r2=369281
==============================================================================
--- team/rmudgett/hangup_handlers/main/features.c (original)
+++ team/rmudgett/hangup_handlers/main/features.c Fri Jun 22 18:52:52 2012
@@ -7873,7 +7873,6 @@
 	struct ast_bridge_config bconfig = { { 0, }, };
 	char *opt_args[OPT_ARG_ARRAY_SIZE];
 	struct timeval calldurationlimit = { 0, };
-	int res;
 
 	AST_DECLARE_APP_ARGS(args,
 		AST_APP_ARG(dest_chan);
@@ -8018,7 +8017,7 @@
 
 	/*
 	 * Don't let the after-bridge code run the h-exten.  We want to
-	 * continue in the dialplan if we did not hangup.
+	 * continue in the dialplan.
 	 */
 	ast_set_flag(ast_channel_flags(chan), AST_FLAG_BRIDGE_HANGUP_DONT);
 	ast_bridge_call(chan, final_dest_chan, &bconfig);
@@ -8075,13 +8074,7 @@
 	ast_free((char *) bconfig.end_sound);
 	ast_free((char *) bconfig.start_sound);
 
-	/* Continue in the dialplan if we did not hangup. */
-	ast_channel_lock(chan);
-	ast_check_hangup(chan);
-	res = (ast_channel_softhangup_internal_flag(chan) & ~AST_SOFTHANGUP_ASYNCGOTO)
-		? -1 : 0;
-	ast_channel_unlock(chan);
-	return res;
+	return 0;
 }
 
 #if defined(TEST_FRAMEWORK)