diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-13 19:10:16 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-13 19:10:16 +0000 |
| commit | 40a5f668411ecb31097bd3770aeb05621e6c7127 (patch) | |
| tree | e045bc5fc7669286119f04722250f9b40fc5a7e2 /apps | |
| parent | 531f38e736d9ffc633995d269eab4e7be9f53e51 (diff) | |
Merged revisions 69144 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r69144 | file | 2007-06-13 15:08:24 -0400 (Wed, 13 Jun 2007) | 2 lines
Really ignore NULL frames and check whether the channel hungup or not. (issue #9912 reported by junky)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@69147 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_meetme.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 98510667f..934a8d4e1 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -2136,12 +2136,16 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c default: break; } + } else if (f->frametype == AST_FRAME_NULL) { + /* Ignore NULL frames. It is perfectly normal to get these if the person is muted. */ } else if (option_debug) { ast_log(LOG_DEBUG, "Got unrecognized frame on channel %s, f->frametype=%d,f->subclass=%d\n", 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) { |