kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-16 09:46:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix bad edit after conflict resolution

Browse Source 
........

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
This commit is contained in:
Alec L Davis
2013-06-10 08:38:03 +00:00
parent d264518524
commit a6ab25a004
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
channels/chan_iax2.c
View File

@@ -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]);