From bacc0a0c91f908fdbc442f2e7c1dc08efcf0a9eb Mon Sep 17 00:00:00 2001 From: Jonathan Rose Date: Tue, 28 Jun 2011 16:04:18 +0000 Subject: Merged revisions 325152 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r325152 | jrose | 2011-06-28 10:46:29 -0500 (Tue, 28 Jun 2011) | 5 lines Fixes moh reload breaking custom mode moh classes when the config file is untouched (closes issue ASTERISK-17730) Reported by: sdolloff ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@325153 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_musiconhold.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index db7f8525c..7ed595557 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -1150,7 +1150,9 @@ static void moh_rescan_files(void) { i = ao2_iterator_init(mohclasses, 0); while ((c = ao2_iterator_next(&i))) { - moh_scan_files(c); + if (!strcasecmp(c->mode, "files")) { + moh_scan_files(c); + } ao2_ref(c, -1); } -- cgit v1.2.3