diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-27 16:01:47 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-27 16:01:47 +0000 |
| commit | 4c68192dd69bec598e4e420b70a64271d9011602 (patch) | |
| tree | 7c64e5886183a04fbae215f9c31008e349eb663b /channels/chan_local.c | |
| parent | c2b6ab8e4f3c5972e37ef87340f42fcc3e0da6a8 (diff) | |
Merged revisions 125853 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r125853 | tilghman | 2008-06-27 11:00:05 -0500 (Fri, 27 Jun 2008) | 3 lines
Revert half of the fix, as this part may have been unnecessary (related to issue #12914)
Requested here: http://lists.digium.com/pipermail/asterisk-dev/2008-June/033658.html
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@125854 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_local.c')
| -rw-r--r-- | channels/chan_local.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/channels/chan_local.c b/channels/chan_local.c index 617cd2eb9..f5a6ca142 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -516,11 +516,7 @@ static int local_hangup(struct ast_channel *ast) if (!p) return -1; - while (ast_mutex_trylock(&p->lock)) { - ast_channel_unlock(ast); - usleep(1); - ast_channel_lock(ast); - } + ast_mutex_lock(&p->lock); if (p->chan && ast_test_flag(ast, AST_FLAG_ANSWERED_ELSEWHERE)) ast_set_flag(p->chan, AST_FLAG_ANSWERED_ELSEWHERE); |