diff options
| author | bbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-08 21:00:32 +0000 |
|---|---|---|
| committer | bbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-08 21:00:32 +0000 |
| commit | d25403f972fb0f09a4f236199cc4b70eb24540c6 (patch) | |
| tree | 84ed6089abdee66e3070686676569b50c6319194 /apps/app_meetme.c | |
| parent | 4f0452793ab033f91b6a12952a132a0c30dc5968 (diff) | |
Merged revisions 285533 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r285533 | bbryant | 2010-09-08 16:58:43 -0400 (Wed, 08 Sep 2010) | 15 lines
Merged revisions 285532 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
........
r285532 | bbryant | 2010-09-08 16:56:12 -0400 (Wed, 08 Sep 2010) | 8 lines
Fixes a bug with MeetMe where after announcing the amount of time left in a conference, if music on hold was playing, it doesn't restart.
(closes issue #17408)
Reported by: sysreq
Patches:
asterisk-issue-17408_fixed.patch uploaded by sysreq (license 1009)
Tested by: sysreq
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@285534 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 85bb0a645..2f64a9b78 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -2782,6 +2782,9 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc ast_say_digits(chan, (conf->endtime - now.tv_sec) / 60, "", chan->language); if (!ast_streamfile(chan, "minutes", chan->language)) ast_waitstream(chan, ""); + if (musiconhold) { + conf_start_moh(chan, optargs[OPT_ARG_MOH_CLASS]); + } announcement_played = 1; } } @@ -2853,6 +2856,9 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc res = ast_streamfile(chan, user->warning_sound, chan->language); res = ast_waitstream(chan, ""); } + if (musiconhold) { + conf_start_moh(chan, optargs[OPT_ARG_MOH_CLASS]); + } } } if (user->warning_freq) { |