[svn-commits] file: trunk r58995 - in /trunk: ./ apps/app_page.c

[svn-commits at lists.digium.com]

Author: file
Date: Fri Mar 16 11:14:04 2007
New Revision: 58995

URL: http://svn.digium.com/view/asterisk?view=rev&rev=58995
Log:
Merged revisions 58992 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r58992 | file | 2007-03-16 12:12:28 -0400 (Fri, 16 Mar 2007) | 2 lines

Wait for the async thread to exit when hanging up all of the paged phones under all circumstances. (issue #9181 reported by PhilSmith)

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_page.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_page.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_page.c?view=diff&rev=58995&r1=58994&r2=58995
==============================================================================
--- trunk/apps/app_page.c (original)
+++ trunk/apps/app_page.c Fri Mar 16 11:14:04 2007
@@ -177,9 +177,8 @@
 	for (i = 0; i < pos; i++) {
 		struct ast_dial *dial = dials[i];
 
-		/* If the dial is already answered, then they will/should get kicked out by Meetme */
-		if (ast_dial_state(dial) != AST_DIAL_RESULT_ANSWERED)
-			ast_dial_join(dial);
+		/* We have to wait for the async thread to exit as it's possible Meetme won't throw them out immediately */
+		ast_dial_join(dial);
 
 		/* Hangup all channels */
 		ast_dial_hangup(dial);