diff options
| author | bbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-09 18:50:13 +0000 |
|---|---|---|
| committer | bbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-09 18:50:13 +0000 |
| commit | 12ad49e444d6108b7312a46b389090d51b670a7f (patch) | |
| tree | fe20338149990fed28e3936bbbd7162e69d1f938 /apps/app_meetme.c | |
| parent | f8d0dcac122feafe9ebd0aba502263f829c77667 (diff) | |
Fixes an issue with dialplan pattern matching where the specificity for pattern ranges and pattern special characters was inconsistent.
(closes issue #16903)
Reported by: Nick_Lewis
Patches:
pbx.c-specificity.patch uploaded by Nick Lewis (license 657)
Tested by: Nick_Lewis
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@285710 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 3cbc664e3..4ef16189d 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -2622,6 +2622,9 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c 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; } } @@ -2693,6 +2696,9 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c 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) { |