aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormnick <mnick@f38db490-d61c-443f-a65b-d21fe96a405b>2009-09-10 19:55:54 +0000
committermnick <mnick@f38db490-d61c-443f-a65b-d21fe96a405b>2009-09-10 19:55:54 +0000
commit0ef86889417b35c2ee5e3dc4e08698a75b6cf9ec (patch)
tree1f2a69e108d97f2cb0ad707037060b6f17986598
parentf6af880500084cc31584f334b4810a7dd9503cbe (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.1@217738 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--res/res_musiconhold.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 9370db4b9..66f87e270 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -359,14 +359,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, "Unreffing ao2_find from finding by digit");
+ 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 =