diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-27 16:00:05 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-27 16:00:05 +0000 |
| commit | f823a9e252537020f8f258ae3c4f102bb64f682a (patch) | |
| tree | f4a3bc7e75d49ef944bc8b5589519ad8bca4a65a /channels/chan_local.c | |
| parent | a406b4221054e5d6badcd6527b951072300d38c4 (diff) | |
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/trunk@125853 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 499df7269..b2ca3cfb3 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -544,11 +544,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); |