diff options
| author | Alec L Davis <sivad.a@paradise.net.nz> | 2013-06-10 08:38:03 +0000 |
|---|---|---|
| committer | Alec L Davis <sivad.a@paradise.net.nz> | 2013-06-10 08:38:03 +0000 |
| commit | a6ab25a004ee04806c92e9ff009b8a57226334fb (patch) | |
| tree | 5d07a7d1f990f1200fd8f19738011d49c5409544 | |
| parent | d264518524754fccc967d49fba16eeaf54b1af3d (diff) | |
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
| -rw-r--r-- | channels/chan_iax2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index ee215bbe5..80d19f326 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]); |