diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-24 15:57:24 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-24 15:57:24 +0000 |
| commit | 5a80cfcedc6ffdde2acbad3ee406fc3e937b7284 (patch) | |
| tree | ab2b39af7f5fa283543e84aeb84125e032b05676 /channels | |
| parent | 9355c1e143717a4f4d870279ac8c1e67fda7d074 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@114610 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -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 404cd44a8..4d53ca3ab 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -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]); } } |