Merged revisions 114230 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Thu, 17 Apr 2008 22:24:00 +0000 (22:24 +0000)
committerRussell Bryant <russell@russellbryant.com>
Thu, 17 Apr 2008 22:24:00 +0000 (22:24 +0000)
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: https://origsvn.digium.com/svn/asterisk/trunk@114233 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/autoservice.c

index 3b267a6..d348833 100644 (file)
@@ -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);
 
        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);
        while ((f = AST_LIST_REMOVE_HEAD(&dtmf_frames, frame_list))) {
                ast_queue_frame(chan, f);
                ast_frfree(f);