[asterisk-commits] qwell: branch 1.4 r84410 - /branches/1.4/res/res_features.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Tue Oct  2 13:52:55 2007
New Revision: 84410

URL: http://svn.digium.com/view/asterisk?view=rev&rev=84410
Log:
Finish up on transferee channel before return on failure.

Issue 10821, patch by Ivan

Modified:
    branches/1.4/res/res_features.c

Modified: branches/1.4/res/res_features.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/res/res_features.c?view=diff&rev=84410&r1=84409&r2=84410
==============================================================================
--- branches/1.4/res/res_features.c (original)
+++ branches/1.4/res/res_features.c Tue Oct  2 13:52:55 2007
@@ -816,8 +816,11 @@
 		return FEATURE_RETURN_SUCCESS;
 	}
 
-	if (check_compat(transferer, newchan))
+	if (check_compat(transferer, newchan)) {
+		/* we do mean transferee here, NOT transferer */
+		finishup(transferee);
 		return -1;
+	};
 	memset(&bconfig,0,sizeof(struct ast_bridge_config));
 	ast_set_flag(&(bconfig.features_caller), AST_FEATURE_DISCONNECT);
 	ast_set_flag(&(bconfig.features_callee), AST_FEATURE_DISCONNECT);
@@ -831,8 +834,10 @@
 		return FEATURE_RETURN_SUCCESS;
 	}
 	
-	if (check_compat(transferee, newchan))
+	if (check_compat(transferee, newchan)) {
+		finishup(transferee);
 		return -1;
+	};
 
 	ast_indicate(transferee, AST_CONTROL_UNHOLD);