From: Automerge Script <automerge@asterisk.org>
Date: Tue, 19 Jun 2007 14:25:35 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.20-netsec~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abe5474fae00b50a906004b4026f3eda9b7bc6ed;p=thirdparty%2Fasterisk.git

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 8e7f2d8f0a..405dff9aaa 100644
--- 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) {