From: Alec L Davis <sivad.a@paradise.net.nz>
Date: Mon, 10 Jun 2013 08:38:03 +0000 (+0000)
Subject: fix bad edit after conflict resolution
X-Git-Tag: 13.0.0-beta1~1694
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6ab25a004ee04806c92e9ff009b8a57226334fb;p=thirdparty%2Fasterisk.git

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 ee215bbe58..80d19f3261 100644
--- 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]);