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

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 1fa243b504..6c49bf8682 100644
--- 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]);