automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@69941 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 8e7f2d8f0abc4c9781cb9d36c2138813154feb70..405dff9aaa49b98bcee69354fa914c2560589d5a 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -1296,6 +1296,10 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
                                }
                        }
 
+                       /* If the channel wants to be hung up, hang it up */
+                       if (ast_check_hangup(chan))
+                               break;
+
                        if (c) {
                                if (c->fds[0] != origfd) {
                                        if (using_pseudo) {