[Asterisk-cvs] asterisk/channels chan_iax2.c,1.285,1.286

[kpfleming at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv18659/channels

Modified Files:
	chan_iax2.c 
Log Message:
combine two lines of code to make the logic clearer (bug #4273)


Index: chan_iax2.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -d -r1.285 -r1.286
--- chan_iax2.c	15 May 2005 20:00:08 -0000	1.285
+++ chan_iax2.c	15 May 2005 22:05:16 -0000	1.286
@@ -6219,8 +6219,7 @@
 								else
 									f.data = NULL;
 								if(trunked_ts) {
-									fr.ts = trunked_ts;
-									fr.ts = (iaxs[fr.callno]->last & 0xFFFF0000L) | (fr.ts & 0xffff);
+									fr.ts = (iaxs[fr.callno]->last & 0xFFFF0000L) | (trunked_ts & 0xffff);
 								} else
 									fr.ts = fix_peerts(&rxtrunktime, fr.callno, ts);
 								/* Don't pass any packets until we're started */