From ae28bf6e401683dd89dc21dac3aa42b4490896cc Mon Sep 17 00:00:00 2001 From: Alec L Davis Date: Mon, 10 Jun 2013 08:32:34 +0000 Subject: [PATCH] fix bad edit after conflict resolution git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@391107 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 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]);