]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 217286 via svnmerge from
authorSean Bright <sean@malleable.com>
Tue, 8 Sep 2009 22:20:06 +0000 (22:20 +0000)
committerSean Bright <sean@malleable.com>
Tue, 8 Sep 2009 22:20:06 +0000 (22:20 +0000)
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

apps/app_meetme.c

index 4b1ddf91c670f36d2fdb6b15f9454adecbf0e09f..0f73333a25fd3ab5ce43d4db075609a662b5e4b5 100644 (file)
@@ -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;
                                                                }