diff options
| author | Jonathan Rose <jrose@digium.com> | 2012-04-05 17:22:30 +0000 |
|---|---|---|
| committer | Jonathan Rose <jrose@digium.com> | 2012-04-05 17:22:30 +0000 |
| commit | fc45af331bbff5bc2405f4efbdb06183df8ae0aa (patch) | |
| tree | c7bad5943f1c0893d507655938faa23d81c010e0 /apps/app_meetme.c | |
| parent | 8d3855229a8e624edaa79df2e7011c8451f973f8 (diff) | |
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
........
Merged revisions 361270 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@361279 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 46a42a5d3..742d487ff 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -3761,7 +3761,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 { @@ -3783,7 +3783,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 { |