diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-19 13:56:37 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-19 13:56:37 +0000 |
| commit | 0d1fafb70954e55f95c59cc256bc4a216aafbf6b (patch) | |
| tree | ea7e17a3fbb892bb2d2719fe461805ea06766c66 /apps/app_meetme.c | |
| parent | b5209de637ea870f570e6bcd661ff770c0ca5ef1 (diff) | |
Merged revisions 69895 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r69895 | file | 2007-06-19 09:55:25 -0400 (Tue, 19 Jun 2007) | 10 lines
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: http://svn.digium.com/svn/asterisk/trunk@69896 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 7f38c0880..ebb1403a4 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1898,6 +1898,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) { @@ -2157,8 +2161,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) { |