[asterisk-commits] alecdavis: branch 1.8 r391107 - /branches/1.8/channels/chan_iax2.c

[SVN commits to the Asterisk project]

Author: alecdavis
Date: Mon Jun 10 03:32:34 2013
New Revision: 391107

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

Modified:
    branches/1.8/channels/chan_iax2.c

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