From 7f3b41e6b3f7c3fe8f7550a74bdc7c6ca7616460 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Thu, 24 Apr 2008 15:57:24 +0000 Subject: [PATCH] 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 --- channels/chan_iax2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 404cd44a83..4d53ca3ab7 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