[asterisk-commits] jrose: trunk r325864 - in /trunk: ./ res/res_musiconhold.c

[SVN commits to the Asterisk project]

Author: jrose
Date: Thu Jun 30 14:31:51 2011
New Revision: 325864

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

........
  r325821 | jrose | 2011-06-30 14:17:32 -0500 (Thu, 30 Jun 2011) | 10 lines
  
  Fixes an issue with Music on Hold classes losing files in playlist when realtime is used.
  
  The bug occurs rather intermittently and I relied on the reporters to test the patch.
  After a sanity check and some testing, I'm giving it an OK.
  
  (closes issue ASTERISK-17875)
  Reported by: David Cunningham
  Patches: 
        res_musiconhold.c.mohrt17875_v1 uploaded by Igor Goncharovsky (license #5009)
........

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=325864&r1=325863&r2=325864
==============================================================================
--- trunk/res/res_musiconhold.c (original)
+++ trunk/res/res_musiconhold.c Thu Jun 30 14:31:51 2011
@@ -1652,14 +1652,15 @@
 
 	cfg = ast_config_load("musiconhold.conf", config_flags);
 
-	if (cfg == CONFIG_STATUS_FILEMISSING || cfg == CONFIG_STATUS_FILEUNCHANGED || cfg == CONFIG_STATUS_FILEINVALID) {
+	if (cfg == CONFIG_STATUS_FILEMISSING || cfg == CONFIG_STATUS_FILEINVALID) {
 		if (ast_check_realtime("musiconhold") && reload) {
 			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;
+	}
+	if (cfg == CONFIG_STATUS_FILEUNCHANGED) {
+		moh_rescan_files();
 		return 0;
 	}