From: Joshua Colp <jcolp@digium.com>
Date: Thu, 14 May 2009 17:07:04 +0000 (+0000)
Subject: Merged revisions 194434 via svnmerge from
X-Git-Tag: 1.6.1.3-rc1~242
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4000ddaad4a93993be0680435f2e90ab4bbc4a1a;p=thirdparty%2Fasterisk.git

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

........
  r194434 | file | 2009-05-14 14:05:33 -0300 (Thu, 14 May 2009) | 7 lines

  Fix a bug where the 'T' option to Meetme did not work.

  (closes issue #15031)
  Reported by: Stochastic
  (closes issue #13801)
  Reported by: justdave
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@194436 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 6c857c82ed..eb8271e29e 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -2150,7 +2150,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
 			x = 1;
 			ast_channel_setoption(chan, AST_OPTION_TONE_VERIFY, &x, sizeof(char), 0);
 		}	
-		if ((confflags & CONFFLAG_OPTIMIZETALKER) && !(confflags & CONFFLAG_MONITOR) && !(dsp = ast_dsp_new())) {
+		if (confflags & (CONFFLAG_OPTIMIZETALKER | CONFFLAG_MONITORTALKER) && !(dsp = ast_dsp_new())) {
 			ast_log(LOG_WARNING, "Unable to allocate DSP!\n");
 			res = -1;
 		}
@@ -2466,7 +2466,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
 					if (user->talk.actual)
 						ast_frame_adjust_volume(f, user->talk.actual);
 
-					if ((confflags & CONFFLAG_OPTIMIZETALKER) && !(confflags & CONFFLAG_MONITOR)) {
+					if (confflags & (CONFFLAG_OPTIMIZETALKER | CONFFLAG_MONITORTALKER)) {
 						int totalsilence;
 
 						if (user->talking == -1)