[asterisk-commits] kmoore: branch kmoore/bridge_construction-cel_channels r389332 - /team/kmoore...

[SVN commits to the Asterisk project]

Author: kmoore
Date: Mon May 20 17:07:42 2013
New Revision: 389332

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=389332
Log:
Something missed in the rework, make sure we use the right type

Modified:
    team/kmoore/bridge_construction-cel_channels/main/cel.c

Modified: team/kmoore/bridge_construction-cel_channels/main/cel.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/bridge_construction-cel_channels/main/cel.c?view=diff&rev=389332&r1=389331&r2=389332
==============================================================================
--- team/kmoore/bridge_construction-cel_channels/main/cel.c (original)
+++ team/kmoore/bridge_construction-cel_channels/main/cel.c Mon May 20 17:07:42 2013
@@ -1084,7 +1084,7 @@
 	if ((snapshot->capabilities | AST_BRIDGE_CAPABILITY_1TO1MIX)
 		|| (snapshot->capabilities | AST_BRIDGE_CAPABILITY_NATIVE)) {
 		if (ao2_container_count(snapshot->channels) == 1) {
-			RAII_VAR(char *, ao2_primary, ao2_find(bridge_primaries, chan_snapshot->uniqueid, OBJ_KEY), ao2_cleanup);
+			RAII_VAR(struct bridge_assoc *, ao2_primary, ao2_find(bridge_primaries, chan_snapshot->uniqueid, OBJ_KEY), ao2_cleanup);
 			RAII_VAR(char *, channel_id_in_bridge, NULL, ao2_cleanup);
 			char *primary;
 			struct ao2_iterator i;
@@ -1097,7 +1097,7 @@
 			ao2_iterator_destroy(&i);
 
 			if (ao2_primary) {
-				primary = ao2_primary;
+				primary = chan_snapshot->uniqueid;
 			} else {
 				primary = channel_id_in_bridge;
 			}