[asterisk-commits] jpeeler: branch 1.6.0 r238182 - in /branches/1.6.0: ./ apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Wed Jan  6 14:38:28 2010
New Revision: 238182

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=238182
Log:
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
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_meetme.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/apps/app_meetme.c?view=diff&rev=238182&r1=238181&r2=238182
==============================================================================
--- branches/1.6.0/apps/app_meetme.c (original)
+++ branches/1.6.0/apps/app_meetme.c Wed Jan  6 14:38:28 2010
@@ -2477,7 +2477,7 @@
 						   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);
 						}
 					}