From 30cfce07f79fd9ea38244ea25bd38ebc795f85c7 Mon Sep 17 00:00:00 2001
From: Alec L Davis <sivad.a@paradise.net.nz>
Date: Mon, 10 Jun 2013 08:34:46 +0000
Subject: [PATCH] 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
---
 channels/chan_iax2.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 40805435d9..c3a21064db 100644
--- 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]);
-- 
GitLab