From ff3d5422b61a588f4286ec1c1d74b85f44306c58 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Tue, 19 Jun 2007 13:55:25 +0000 Subject: [PATCH] Merged revisions 69894 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r69894 | file | 2007-06-19 09:54:03 -0400 (Tue, 19 Jun 2007) | 2 lines Perform an extra hangup check just in case. (issue #9589 reported by bcnit) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@69895 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_meetme.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/app_meetme.c b/apps/app_meetme.c index ba4e659821..8c60713bd4 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1879,6 +1879,10 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c break; } + /* Perform an extra hangup check just in case */ + if (ast_check_hangup(chan)) + break; + if (c) { if (c->fds[0] != origfd) { if (using_pseudo) { @@ -2137,8 +2141,6 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c chan->name, f->frametype, f->subclass); } ast_frfree(f); - if (ast_check_hangup(chan)) - break; } else if (outfd > -1) { res = read(outfd, buf, CONF_SIZE); if (res > 0) {