From: Jeff Peeler <jpeeler@digium.com>
Date: Wed, 6 Jan 2010 20:39:26 +0000 (+0000)
Subject: Merged revisions 238181 via svnmerge from
X-Git-Tag: 1.6.1.13-rc1~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a2396e446255d8b855993915b5f83613eef927e;p=thirdparty%2Fasterisk.git

Merged revisions 238181 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r238181 | jpeeler | 2010-01-06 14:37:18 -0600 (Wed, 06 Jan 2010) | 8 lines

  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/branches/1.6.1@238183 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index f6ecf1fad7..bd906dfb26 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -2530,7 +2530,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
 						   don't want to block, but we do want to at least *try*
 						   to write out all the samples.
 						 */
-						if (user->talking && !(confflags & CONFFLAG_OPTIMIZETALKER)) {
+						if (user->talking || !(confflags & CONFFLAG_OPTIMIZETALKER)) {
 							careful_write(fd, f->data.ptr, f->datalen, 0);
 						}
 					}