diff options
| author | Jeff Peeler <jpeeler@digium.com> | 2010-01-06 20:37:18 +0000 |
|---|---|---|
| committer | Jeff Peeler <jpeeler@digium.com> | 2010-01-06 20:37:18 +0000 |
| commit | c6e038ba16f27e2d0f1dec1026d3aa4fa0ea12a0 (patch) | |
| tree | e4d59352ac5482b38af8d951cef7f62893db9c22 /apps/app_meetme.c | |
| parent | 0a4f80cbcf71f9ef90af627d4c66262bab9a8a53 (diff) | |
Fix misreverting from 177158.
(closes issue #15725)
Reported by: shanermn
Patches:
v1-15725.patch uploaded by dimas (license 88)
Tested by: shanermn
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@238181 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 335e79f22..d340ae1b3 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -3032,7 +3032,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc don't want to block, but we do want to at least *try* to write out all the samples. */ - if (user->talking && !ast_test_flag64(confflags, CONFFLAG_OPTIMIZETALKER)) { + if (user->talking || !ast_test_flag64(confflags, CONFFLAG_OPTIMIZETALKER)) { careful_write(fd, f->data.ptr, f->datalen, 0); } } |