[asterisk-commits] jpeeler: branch 1.6.0 r162928 - in /branches/1.6.0: ./ res/res_musiconhold.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Wed Dec 10 16:54:01 2008
New Revision: 162928

URL: http://svn.digium.com/view/asterisk?view=rev&rev=162928
Log:
Merged revisions 162927 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r162927 | jpeeler | 2008-12-10 16:53:34 -0600 (Wed, 10 Dec 2008) | 11 lines

Merged revisions 162926 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r162926 | jpeeler | 2008-12-10 16:52:51 -0600 (Wed, 10 Dec 2008) | 3 lines

Oops, inverted logic for a strcasecmp check. Pointed out by mmichelson, thanks!


........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/res/res_musiconhold.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/res/res_musiconhold.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/res/res_musiconhold.c?view=diff&rev=162928&r1=162927&r2=162928
==============================================================================
--- branches/1.6.0/res/res_musiconhold.c (original)
+++ branches/1.6.0/res/res_musiconhold.c Wed Dec 10 16:54:01 2008
@@ -413,7 +413,7 @@
 		files = 1;
 	} else {
 		dir = opendir(class->dir);
-		if (!dir && !strncasecmp(class->dir, "http://", 7)) {
+		if (!dir && strncasecmp(class->dir, "http://", 7)) {
 			ast_log(LOG_WARNING, "%s is not a valid directory\n", class->dir);
 			return -1;
 		}