[svn-commits] sruffell: branch sruffell/asterisk-1.4-transcoder r166435 - /team/sruffell/as...

[SVN commits to the Digium repositories]

Author: sruffell
Date: Mon Dec 22 15:36:09 2008
New Revision: 166435

URL: http://svn.digium.com/view/asterisk?view=rev&rev=166435
Log:
Applying AST-172.patch in order to simplify testing.  This should be removed
before merging (this patch should be merged in separately from the changes to
the transcoder).

Modified:
    team/sruffell/asterisk-1.4-transcoder/channels/chan_local.c

Modified: team/sruffell/asterisk-1.4-transcoder/channels/chan_local.c
URL: http://svn.digium.com/view/asterisk/team/sruffell/asterisk-1.4-transcoder/channels/chan_local.c?view=diff&rev=166435&r1=166434&r2=166435
==============================================================================
--- team/sruffell/asterisk-1.4-transcoder/channels/chan_local.c (original)
+++ team/sruffell/asterisk-1.4-transcoder/channels/chan_local.c Mon Dec 22 15:36:09 2008
@@ -168,10 +168,6 @@
 	/* Recalculate outbound channel */
 	other = isoutbound ? p->owner : p->chan;
 
-	/* do not queue frame if generator is on both local channels */
-	if (us && us->generator && other->generator)
-		return 0;
-
 	/* Set glare detection */
 	ast_set_flag(p, LOCAL_GLARE_DETECT);
 	if (ast_test_flag(p, LOCAL_CANCEL_QUEUE)) {
@@ -181,10 +177,15 @@
 		p = local_pvt_destroy(p);
 		return -1;
 	}
+
 	if (!other) {
 		ast_clear_flag(p, LOCAL_GLARE_DETECT);
 		return 0;
 	}
+	
+	/* do not queue frame if generator is on both local channels */
+	if (us && us->generator && other->generator)
+		return 0;
 
 	/* Ensure that we have both channels locked */
 	while (other && ast_channel_trylock(other)) {