[asterisk-commits] russell: branch 1.6.0 r114234 - in /branches/1.6.0: ./ main/autoservice.c

[SVN commits to the Asterisk project]

Author: russell
Date: Thu Apr 17 17:24:20 2008
New Revision: 114234

URL: http://svn.digium.com/view/asterisk?view=rev&rev=114234
Log:
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

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/autoservice.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/autoservice.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/autoservice.c?view=diff&rev=114234&r1=114233&r2=114234
==============================================================================
--- branches/1.6.0/main/autoservice.c (original)
+++ branches/1.6.0/main/autoservice.c Thu Apr 17 17:24:20 2008
@@ -265,10 +265,6 @@
 	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);