[asterisk-commits] mnick: trunk r217730 - /trunk/res/res_musiconhold.c

[SVN commits to the Asterisk project]

Author: mnick
Date: Thu Sep 10 14:39:41 2009
New Revision: 217730

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=217730
Log:

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



Modified:
    trunk/res/res_musiconhold.c

Modified: trunk/res/res_musiconhold.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/res/res_musiconhold.c?view=diff&rev=217730&r1=217729&r2=217730
==============================================================================
--- trunk/res/res_musiconhold.c (original)
+++ trunk/res/res_musiconhold.c Thu Sep 10 14:39:41 2009
@@ -386,14 +386,10 @@
 	if ((class = get_mohbydigit(digit))) {
 		classname = ast_strdupa(class->name);
 		class = mohclass_unref(class, "Unreffing ao2_find from finding by digit");
-	}
-
-	if (!class) {
-		return;
-	}
-
-	ast_moh_stop(chan);
-	ast_moh_start(chan, classname, NULL);
+		ast_string_field_set(chan,musicclass,classname);
+		ast_moh_stop(chan);
+		ast_moh_start(chan, classname, NULL);
+	}
 }
 
 static struct ast_generator moh_file_stream =