[asterisk-commits] rmudgett: trunk r363377 - in /trunk: ./ main/features.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Tue Apr 24 19:03:52 2012
New Revision: 363377

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=363377
Log:
Hangup affected channel in error paths of bridge_call_thread().
........

Merged revisions 363375 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 363376 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    trunk/   (props changed)
    trunk/main/features.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/main/features.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/features.c?view=diff&rev=363377&r1=363376&r2=363377
==============================================================================
--- trunk/main/features.c (original)
+++ trunk/main/features.c Tue Apr 24 19:03:52 2012
@@ -967,17 +967,23 @@
 		if (!ast_check_hangup(tobj->peer)) {
 			ast_log(LOG_VERBOSE, "putting peer %s into PBX again\n", ast_channel_name(tobj->peer));
 			res = ast_pbx_start(tobj->peer);
-			if (res != AST_PBX_SUCCESS)
+			if (res != AST_PBX_SUCCESS) {
 				ast_log(LOG_WARNING, "FAILED continuing PBX on peer %s\n", ast_channel_name(tobj->peer));
-		} else
+				ast_hangup(tobj->peer);
+			}
+		} else {
 			ast_hangup(tobj->peer);
+		}
 		if (!ast_check_hangup(tobj->chan)) {
 			ast_log(LOG_VERBOSE, "putting chan %s into PBX again\n", ast_channel_name(tobj->chan));
 			res = ast_pbx_start(tobj->chan);
-			if (res != AST_PBX_SUCCESS)
+			if (res != AST_PBX_SUCCESS) {
 				ast_log(LOG_WARNING, "FAILED continuing PBX on chan %s\n", ast_channel_name(tobj->chan));
-		} else
+				ast_hangup(tobj->chan);
+			}
+		} else {
 			ast_hangup(tobj->chan);
+		}
 	} else {
 		ast_hangup(tobj->chan);
 		ast_hangup(tobj->peer);