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: https://origsvn.digium.com/svn/asterisk/trunk@217730 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 7a96be5..090f927 100644 (file)
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -386,14 +386,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 =