[asterisk-commits] alecdavis: trunk r391112 - in /trunk: ./ channels/chan_iax2.c

[SVN commits to the Asterisk project]

Author: alecdavis
Date: Mon Jun 10 03:38:03 2013
New Revision: 391112

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=391112
Log:
fix bad edit after conflict resolution
........

Merged revisions 391107 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 391111 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)
    trunk/channels/chan_iax2.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: trunk/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_iax2.c?view=diff&rev=391112&r1=391111&r2=391112
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Mon Jun 10 03:38:03 2013
@@ -11225,9 +11225,9 @@
 				}
 
 				if (iaxs[fr->callno]->transferring == TRANSFER_BEGIN) {
+					iaxs[fr->callno]->transferring = TRANSFER_READY;
+				} else if (iaxs[fr->callno]->transferring == TRANSFER_MBEGIN) {
 					iaxs[fr->callno]->transferring = TRANSFER_MREADY;
-				} else if (iaxs[fr->callno]->transferring == TRANSFER_MBEGIN) {
-					iaxs[fr->callno]->transferring = TRANSFER_READY;
 				} else {
 					if (iaxs[fr->callno]->bridgecallno) {
 						ast_mutex_unlock(&iaxsl[iaxs[fr->callno]->bridgecallno]);