fix bad edit after conflict resolution

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@391107 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 1fa243b5040dc18203323bb3a4c085303e4efacc..6c49bf868249005b78c8238917b26f02ad0a4a0d 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -11390,9 +11390,9 @@ immediatedial:
                                }
 
                                if (iaxs[fr->callno]->transferring == TRANSFER_BEGIN) {
-                                       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]->transferring == TRANSFER_MBEGIN) {
+                                       iaxs[fr->callno]->transferring = TRANSFER_MREADY;
                                } else {
                                        if (iaxs[fr->callno]->bridgecallno) {
                                                ast_mutex_unlock(&iaxsl[iaxs[fr->callno]->bridgecallno]);