Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

fix bad edit after conflict resolution

Browse Source 
........

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
changes/61/61/1
Alec L Davis 13 years ago
parent 20b9dac9fc
commit 30cfce07f7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

4
channels/chan_iax2.c
Unescape View File

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

Write Preview
Loading…
Cancel
Save