aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/app_meetme.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 39b3a57f8..7872a96b2 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -2352,6 +2352,10 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
ast_mutex_lock(&conf->listenlock);
if (!conf->transframe[index]) {
if (conf->origframe) {
+ if (musiconhold && !ast_dsp_silence(dsp, conf->origframe, &confsilence) && confsilence < MEETME_DELAYDETECTTALK) {
+ ast_moh_stop(chan);
+ mohtempstopped = 1;
+ }
if (!conf->transpath[index])
conf->transpath[index] = ast_translator_build_path((1 << index), AST_FORMAT_SLINEAR);
if (conf->transpath[index]) {
@@ -2365,11 +2369,6 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
if ((conf->transframe[index]->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) {
- ast_moh_stop(chan);
- mohtempstopped = 1;
- }
-
/* the translator may have returned a list of frames, so
write each one onto the channel
*/