[asterisk-commits] irroot: branch irroot/distrotech-customers-1.8 r338035 - /team/irroot/distrot...

[SVN commits to the Asterisk project]

Author: irroot
Date: Tue Sep 27 06:20:56 2011
New Revision: 338035

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=338035
Log:
Make sure bridge is external chan

Modified:
    team/irroot/distrotech-customers-1.8/channels/chan_local.c

Modified: team/irroot/distrotech-customers-1.8/channels/chan_local.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/channels/chan_local.c?view=diff&rev=338035&r1=338034&r2=338035
==============================================================================
--- team/irroot/distrotech-customers-1.8/channels/chan_local.c (original)
+++ team/irroot/distrotech-customers-1.8/channels/chan_local.c Tue Sep 27 06:20:56 2011
@@ -610,8 +610,8 @@
 		ao2_unlock(p);
 		bridge = ast_bridged_channel(ast);
 		ao2_lock(p);
-		if (bridge && !(bridge->nativeformats & ast->nativeformats)) {
-			while (lockcheck && p->chan && ast_channel_trylock(p->chan)) {
+		if (p->chan && bridge && (bridge != p->chan) && !(bridge->nativeformats & ast->nativeformats)) {
+			while (lockcheck && ast_channel_trylock(p->chan)) {
 				lockcheck--;
 				ao2_unlock(p);
 				usleep(1000);