[svn-commits] jrose: trunk r325153 - in /trunk: ./ res/res_musiconhold.c

[SVN commits to the Digium repositories]

Author: jrose
Date: Tue Jun 28 11:04:18 2011
New Revision: 325153

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=325153
Log:
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
........

Modified:
    trunk/   (props changed)
    trunk/res/res_musiconhold.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/res/res_musiconhold.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_musiconhold.c?view=diff&rev=325153&r1=325152&r2=325153
==============================================================================
--- trunk/res/res_musiconhold.c (original)
+++ trunk/res/res_musiconhold.c Tue Jun 28 11:04:18 2011
@@ -1150,7 +1150,9 @@
 	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);
 	}