[svn-commits] file: branch 1.2 r42600 - /branches/1.2/channel.c

[svn-commits at lists.digium.com]

Author: file
Date: Sat Sep  9 15:24:19 2006
New Revision: 42600

URL: http://svn.digium.com/view/asterisk?rev=3D42600&view=3Drev
Log:
Only truly consider the channel in the same format if the format matches th=
e raw format OR if a translation path already exists to translate between t=
hem. (issue #7887 reported by softins & issue #7803 reported by alvaro_palm=
a_aste). Thanks goes to stubert for giving me access to a box and showing m=
e a scenario where this occured.

Modified:
    branches/1.2/channel.c

Modified: branches/1.2/channel.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/channel.c?rev=3D42600=
&r1=3D42599&r2=3D42600&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/1.2/channel.c (original)
+++ branches/1.2/channel.c Sat Sep  9 15:24:19 2006
@@ -2385,7 +2385,7 @@
 	/* Now we have a good choice for both. */
 	ast_mutex_lock(&chan->lock);
 =

-	if ((*rawformat =3D=3D native) && (*format =3D=3D fmt)) {
+	if ((*rawformat =3D=3D native) && (*format =3D=3D fmt) && ((*rawformat =
=3D=3D *format) || (*trans))) {
 		/* the channel is already in these formats, so nothing to do */
 		ast_mutex_unlock(&chan->lock);
 		return 0;