[asterisk-commits] mmichelson: branch mmichelson/atxfer_features r393869 - /team/mmichelson/atxf...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Mon Jul  8 18:45:06 2013
New Revision: 393869

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=393869
Log:
Search both the src and dest bridges for the channel we intend to kick out.

This fixes issues seen when attempting to complete a transfer while in the
DOUBLECHECKING state.


Modified:
    team/mmichelson/atxfer_features/main/bridging_basic.c

Modified: team/mmichelson/atxfer_features/main/bridging_basic.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/atxfer_features/main/bridging_basic.c?view=diff&rev=393869&r1=393868&r2=393869
==============================================================================
--- team/mmichelson/atxfer_features/main/bridging_basic.c (original)
+++ team/mmichelson/atxfer_features/main/bridging_basic.c Mon Jul  8 18:45:06 2013
@@ -1227,6 +1227,9 @@
 		struct ast_bridge_channel *kick_bridge_channel;
 
 		kick_bridge_channel = find_bridge_channel(src, kick_channels[i]);
+		if (!kick_bridge_channel) {
+			kick_bridge_channel = find_bridge_channel(dest, kick_channels[i]);
+		}
 
 		/* It's possible (and fine) for the bridge channel to be NULL at this point if the
 		 * channel has hung up already. If that happens, we can just remove it from the list