diff options
| author | mnick <mnick@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-10 19:53:41 +0000 |
|---|---|---|
| committer | mnick <mnick@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-10 19:53:41 +0000 |
| commit | ba2f4a622698286de987e2ee0865f356e66d5b4e (patch) | |
| tree | 0fad2c73d0310950d8cc6ff2485f42a0850395b4 /res | |
| parent | d1e59745057280c7bd1c45bd1549dc32f71fd38e (diff) | |
Merged revisions 217730 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r217730 | mnick | 2009-09-10 14:39:41 -0500 (Thu, 10 Sep 2009) | 17 lines
Sets the correct musicclass after an announcement
(closes issue #15279)
Reported by: mbeckwell
Patches:
patch.txt uploaded by mnick (license )
Tested by: mnick
(closes issue #15832)
Reported by: mbeckwell
Patches:
patch.txt uploaded by mnick (license 874)
Tested by: mnick
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@217736 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_musiconhold.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index c0076209a..1eb8d10df 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -362,14 +362,10 @@ static void moh_handle_digit(struct ast_channel *chan, char digit) if ((class = get_mohbydigit(digit))) { classname = ast_strdupa(class->name); class = mohclass_unref(class); + ast_string_field_set(chan,musicclass,classname); + ast_moh_stop(chan); + ast_moh_start(chan, classname, NULL); } - - if (!class) { - return; - } - - ast_moh_stop(chan); - ast_moh_start(chan, classname, NULL); } static struct ast_generator moh_file_stream = |