fix bad edit after conflict resolution

........

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

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

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 40805435d9c97c64c7be9b74cdfcf9706180928f..c3a21064db742461621e35370764e789d9ba7df0 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -11530,9 +11530,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]);