Merged revisions 58992 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Fri, 16 Mar 2007 16:14:04 +0000 (16:14 +0000)
committerJoshua Colp <jcolp@digium.com>
Fri, 16 Mar 2007 16:14:04 +0000 (16:14 +0000)
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)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@58995 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_page.c

index f324dd5..b6a6339 100644 (file)
@@ -177,9 +177,8 @@ static int page_exec(struct ast_channel *chan, void *data)
        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);