From: Matthias Nick <mnick@digium.com>
Date: Thu, 10 Sep 2009 19:55:54 +0000 (+0000)
Subject: Merged revisions 217730 via svnmerge from
X-Git-Tag: 1.6.1.7-rc1~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43ba36ed2e3767c4219f38a07fe9ef37a237dd82;p=thirdparty%2Fasterisk.git

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

diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 9370db4b90..66f87e270a 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 =