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

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

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index ee215bbe589be42fe0672aa828b3241b8ebaa659..80d19f32619897110ef55c9db2f3533be8afc034 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -11225,9 +11225,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]);