aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorautomerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b>2007-06-19 14:25:35 +0000
committerautomerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b>2007-06-19 14:25:35 +0000
commit55468a7460db55ec39f37864ce41ce7636429466 (patch)
tree21597157865b51477e1bb790cca945c3972f7f4e
parent0bad28fa6eec55d765dfe9857993619013163238 (diff)
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@69941 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--apps/app_meetme.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 8e7f2d8f0..405dff9aa 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) {