Merged revisions 89053 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Tue, 6 Nov 2007 20:22:50 +0000 (20:22 +0000)
committerRussell Bryant <russell@russellbryant.com>
Tue, 6 Nov 2007 20:22:50 +0000 (20:22 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89053 | russell | 2007-11-06 14:18:49 -0600 (Tue, 06 Nov 2007) | 3 lines

Fix init_classes() so that classes that actually do have files loaded aren't
treated as empty, and immediately destroyed ...

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89054 65c4cc65-6c06-0410-ace0-fbb531ad65f3

res/res_musiconhold.c

index 4e2df23..374864b 100644 (file)
@@ -1297,7 +1297,7 @@ static int init_classes(int reload)
                        if (!moh->inuse)
                                ast_moh_destroy_one(moh);
                } else if (moh->total_files) {
-                       if (moh_scan_files(moh)) {
+                       if (moh_scan_files(moh) <= 0) {
                                ast_log(LOG_WARNING, "No files found for class '%s'\n", moh->name);
                                moh->delete = 1;
                                AST_LIST_REMOVE_CURRENT(&mohclasses, list);