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.0@238182 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_meetme.c

@@ -2477,7 +2477,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, f->datalen, 0);
 						}
 					}