diff options
| author | jrose <jrose@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-06-30 19:31:51 +0000 |
|---|---|---|
| committer | jrose <jrose@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-06-30 19:31:51 +0000 |
| commit | cc9f50f88e7668eef16d6f3a1bd8568e2ff0e7ae (patch) | |
| tree | b919d4e7289819a0725d661875e95400a9e6e9f3 /res | |
| parent | 405c5bbc3e861cf4dc25682e1cd0da52dbca7878 (diff) | |
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)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@325864 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_musiconhold.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index 7ed595557..cc98543c6 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -1652,14 +1652,15 @@ static int load_moh_classes(int reload) 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; } |