aboutsummaryrefslogtreecommitdiffstats
path: root/apps/app_meetme.c
diff options
context:
space:
mode:
authorjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-06 20:37:18 +0000
committerjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-06 20:37:18 +0000
commit37396b75c03ffd469d341b906e6a1df715af3afd (patch)
treee4d59352ac5482b38af8d951cef7f62893db9c22 /apps/app_meetme.c
parent806dd8ab248001a6f731d04d5acbd4b860e0af4e (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: http://svn.digium.com/svn/asterisk/trunk@238181 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_meetme.c')
-rw-r--r--apps/app_meetme.c2
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);
}
}