From: Sean Bright <sean@malleable.com>
Date: Tue, 8 Sep 2009 22:20:06 +0000 (+0000)
Subject: Merged revisions 217286 via svnmerge from
X-Git-Tag: 1.6.1.7-rc1~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be3c80c53515a2a0e20ca4a61a06b0a09f771496;p=thirdparty%2Fasterisk.git

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

........
  r217286 | seanbright | 2009-09-08 18:17:08 -0400 (Tue, 08 Sep 2009) | 4 lines

  Fix compilation of app_meetme.

  Reported by ebroad in #asterisk-bugs
........


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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 4b1ddf91c6..0f73333a25 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -2756,7 +2756,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
  							if ((conf->transframe[idx]->frametype != AST_FRAME_NULL) &&
 							    can_write(chan, confflags)) {
 								struct ast_frame *cur;
-								if (musiconhold && !ast_dsp_silence(dsp, conf->transframe[index], &confsilence) && confsilence < MEETME_DELAYDETECTTALK) {
+								if (musiconhold && !ast_dsp_silence(dsp, conf->transframe[idx], &confsilence) && confsilence < MEETME_DELAYDETECTTALK) {
 									ast_moh_stop(chan);
 									mohtempstopped = 1;
 								}