[svn-commits] qwell: trunk r285528 - in /trunk: ./ res/res_musiconhold.c

[SVN commits to the Digium repositories]

Author: qwell
Date: Wed Sep  8 15:32:49 2010
New Revision: 285528

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=285528
Log:
Merged revisions 285527 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r285527 | qwell | 2010-09-08 15:32:13 -0500 (Wed, 08 Sep 2010) | 15 lines
  
  Merged revisions 285526 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r285526 | qwell | 2010-09-08 15:31:43 -0500 (Wed, 08 Sep 2010) | 8 lines
    
    Fixes issue where moh files were no longer rescanned during a reload.
    
    (closes issue #16744)
    Reported by: pj
    Patches: 
          16744-reload.diff uploaded by qwell (license 4)
    Tested by: qwell
  ........
................

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=285528&r1=285527&r2=285528
==============================================================================
--- trunk/res/res_musiconhold.c (original)
+++ trunk/res/res_musiconhold.c Wed Sep  8 15:32:49 2010
@@ -1114,6 +1114,19 @@
 	return 0;
 }
 
+static void moh_rescan_files(void) {
+	struct ao2_iterator i;
+	struct mohclass *c;
+
+	i = ao2_iterator_init(mohclasses, 0);
+
+	while ( (c = ao2_iterator_next(&i)) ) {
+		moh_scan_files(c);
+		ao2_ref(c, -1);
+	}
+
+	ao2_iterator_destroy(&i);
+}
 
 static int moh_diff(struct mohclass *old, struct mohclass *new)
 {
@@ -1607,6 +1620,9 @@
 			ao2_t_callback(mohclasses, OBJ_NODATA, moh_class_mark, NULL, "Mark deleted classes");
 			ao2_t_callback(mohclasses, OBJ_UNLINK | OBJ_NODATA | OBJ_MULTIPLE, moh_classes_delete_marked, NULL, "Purge marked classes");
 		}
+		if (cfg == CONFIG_STATUS_FILEUNCHANGED) {
+			moh_rescan_files();
+		}
 		return 0;
 	}