[svn-commits] alecdavis: branch 11 r391111 - in /branches/11: ./ channels/chan_iax2.c

[SVN commits to the Digium repositories]

Author: alecdavis
Date: Mon Jun 10 03:34:46 2013
New Revision: 391111

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

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

Modified:
    branches/11/   (props changed)
    branches/11/channels/chan_iax2.c

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

Modified: branches/11/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/channels/chan_iax2.c?view=diff&rev=391111&r1=391110&r2=391111
==============================================================================
--- branches/11/channels/chan_iax2.c (original)
+++ branches/11/channels/chan_iax2.c Mon Jun 10 03:34:46 2013
@@ -11530,9 +11530,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]);