From d725076ccc1db48603e6387bfb46fcf7dc27e69b Mon Sep 17 00:00:00 2001 From: jpeeler Date: Wed, 6 Jan 2010 20:40:34 +0000 Subject: 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: http://svn.digium.com/svn/asterisk/branches/1.6.2@238185 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_meetme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 7c2081aee..40f1fcd04 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -2920,7 +2920,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); } } -- cgit v1.2.3