From 935f346a73706457ff5f16815fda25ca68c8ae9f Mon Sep 17 00:00:00 2001 From: Jonathan Rose Date: Thu, 5 Apr 2012 16:53:35 +0000 Subject: [PATCH] Fix MusicOnHold in MeetMe so that it always uses the class if it's been defined There were a few instances of restarting music on hold in meetme that would cause Asterisk to revert to the default class of music on hold for no adequate reason. Review: https://reviewboard.asterisk.org/r/1844/ ........ Merged revisions 361269 from http://svn.asterisk.org/svn/asterisk/branches/1.8 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@361270 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_meetme.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 6122a55cd3..a43424a4ed 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -3738,7 +3738,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc } if (musiconhold && mohtempstopped && confsilence > MEETME_DELAYDETECTENDTALK) { mohtempstopped = 0; - ast_moh_start(chan, NULL, NULL); + conf_start_moh(chan, optargs[OPT_ARG_MOH_CLASS]); } } } else { @@ -3760,7 +3760,7 @@ bailoutandtrynormal: } if (musiconhold && mohtempstopped && confsilence > MEETME_DELAYDETECTENDTALK) { mohtempstopped = 0; - ast_moh_start(chan, NULL, NULL); + conf_start_moh(chan, optargs[OPT_ARG_MOH_CLASS]); } } } else { -- 2.47.2