diff options
| author | Jonathan Rose <jrose@digium.com> | 2011-06-28 16:04:18 +0000 |
|---|---|---|
| committer | Jonathan Rose <jrose@digium.com> | 2011-06-28 16:04:18 +0000 |
| commit | bacc0a0c91f908fdbc442f2e7c1dc08efcf0a9eb (patch) | |
| tree | fdf9f8dee0574fa02cac7636c3caa0b7a2249b70 /res/res_musiconhold.c | |
| parent | 481269754232e9cfe5945de348b9f12f16272ae8 (diff) | |
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
Diffstat (limited to 'res/res_musiconhold.c')
| -rw-r--r-- | res/res_musiconhold.c | 4 |
1 files changed, 3 insertions, 1 deletions
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); } |