From: Jeff Peeler <jpeeler@digium.com>
Date: Wed, 6 Jan 2010 20:37:18 +0000 (+0000)
Subject: Fix misreverting from 177158.
X-Git-Tag: 11.0.0-beta1~3653
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c6e038ba16f27e2d0f1dec1026d3aa4fa0ea12a0;p=thirdparty%2Fasterisk.git

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
---

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 335e79f225..d340ae1b32 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);
 						}
 					}