aboutsummaryrefslogtreecommitdiffstats
path: root/apps/app_meetme.c
diff options
context:
space:
mode:
authorroot <root@f38db490-d61c-443f-a65b-d21fe96a405b>2006-02-14 21:05:23 +0000
committerroot <root@f38db490-d61c-443f-a65b-d21fe96a405b>2006-02-14 21:05:23 +0000
commit0c6de9924da5838b0e06ac72b52a043c8adefcda (patch)
treee86ee0646dda7e9f37665874a54cf6b25d650c06 /apps/app_meetme.c
parentae3b6202de1dcac251f5d7b84d6a917763efbb9e (diff)
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@10044 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_meetme.c')
-rw-r--r--apps/app_meetme.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 63b6691fa..37d34d395 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -1523,6 +1523,10 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
lastmarked = currentmarked;
}
}
+
+ if (musiconhold)
+ ast_moh_stop(chan);
+
if (using_pseudo)
close(fd);
else {