diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-06 20:39:26 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-06 20:39:26 +0000 |
| commit | 2e9b146102ed4881d0cdecfcd57ac11b577e86db (patch) | |
| tree | b169122b37c3ea1927c0b8e161e6b16dd0eb1ad4 | |
| parent | f862825ca09ed6c4fb58b71a46c86fdf8576f105 (diff) | |
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.1@238183 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_meetme.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index f6ecf1fad..bd906dfb2 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); } } |