[svn-commits] russell: trunk r89054 - in /trunk: ./ res/res_musiconhold.c

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Nov  6 14:22:50 2007
New Revision: 89054

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89054
Log:
Merged revisions 89053 via svnmerge from 
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 ...

........

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

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

Modified: trunk/res/res_musiconhold.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_musiconhold.c?view=diff&rev=89054&r1=89053&r2=89054
==============================================================================
--- trunk/res/res_musiconhold.c (original)
+++ trunk/res/res_musiconhold.c Tue Nov  6 14:22:50 2007
@@ -1297,7 +1297,7 @@
 			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);