diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-17 22:24:20 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-17 22:24:20 +0000 |
commit | 9300f2e6778f965aef98916a2f80788ecf630335 (patch) | |
tree | 76bcb6a249baaca26dc4ba1dc3f1a2ddd0369e56 /main | |
parent | 0271fa56d014960aec3855157fea4fb79dcff408 (diff) |
Merged revisions 114233 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r114233 | russell | 2008-04-17 17:24:00 -0500 (Thu, 17 Apr 2008) | 14 lines
Merged revisions 114230 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114230 | russell | 2008-04-17 17:15:43 -0500 (Thu, 17 Apr 2008) | 6 lines
Remove redundant safety net. The check for the autoservice channel list state
accomplishes the same goal in a better way.
(issue #12470)
Reported By: atis
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114234 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r-- | main/autoservice.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/main/autoservice.c b/main/autoservice.c index 3b267a6ab..d34883389 100644 --- a/main/autoservice.c +++ b/main/autoservice.c @@ -265,10 +265,6 @@ int ast_autoservice_stop(struct ast_channel *chan) if (!orig_end_dtmf_flag) ast_clear_flag(chan, AST_FLAG_END_DTMF_ONLY); - /* Wait for it to un-block */ - while (ast_test_flag(chan, AST_FLAG_BLOCKING)) - usleep(1000); - while ((f = AST_LIST_REMOVE_HEAD(&dtmf_frames, frame_list))) { ast_queue_frame(chan, f); ast_frfree(f); |