kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 03:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix MusicOnHold in MeetMe so that it always uses the class if it's been defined

Browse Source 
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
This commit is contained in:
Jonathan Rose
2012-04-05 17:22:30 +00:00
parent 8d3855229a
commit fc45af331b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/app_meetme.c
View File

@@ -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 {