kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 69894 via svnmerge from

Browse Source 
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
This commit is contained in:
Joshua Colp
2007-06-19 13:55:25 +00:00
parent bba22a6876
commit ff3d5422b6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/app_meetme.c
View File

@@ -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) {