Merged revisions 114609 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
r114609 | russell | 2008-04-24 10:56:55 -0500 (Thu, 24 Apr 2008) | 12 lines

Merged revisions 114608 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r114608 | russell | 2008-04-24 10:55:21 -0500 (Thu, 24 Apr 2008) | 4 lines

Fix a silly mistake in a change I made yesterday that caused chan_iax2 to blow
up very quickly.
(issue #12515)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114610 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.0
Russell Bryant 19 years ago
parent d6cf0c7823
commit 7f3b41e6b3

@ -1500,7 +1500,7 @@ static int __find_callno(unsigned short callno, unsigned short dcallno, struct s
res = x;
}
}
if (res && !return_locked)
if (!res || (res && !return_locked))
ast_mutex_unlock(&iaxsl[x]);
}
for (x=TRUNK_CALL_START;(res < 1) && (x<maxtrunkcall);x++) {
@ -1511,7 +1511,7 @@ static int __find_callno(unsigned short callno, unsigned short dcallno, struct s
res = x;
}
}
if (res && !return_locked)
if (!res || (res && !return_locked))
ast_mutex_unlock(&iaxsl[x]);
}
}

Loading…
Cancel
Save