[svn-commits] file: trunk r181661 - in /trunk: ./ res/res_musiconhold.c

[SVN commits to the Digium repositories]

Author: file
Date: Thu Mar 12 11:53:52 2009
New Revision: 181661

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=181661
Log:
Merged revisions 181659-181660 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r181659 | file | 2009-03-12 13:50:37 -0300 (Thu, 12 Mar 2009) | 8 lines
  
  Fix another scenario where depending on configuration the stream would not get read.
  
  For custom commands we don't know whether the audio is coming from a stream or not
  so we are going to have to read the data despite no channels.
  
  (closes issue #14416)
  Reported by: caspy
........
  r181660 | file | 2009-03-12 13:52:45 -0300 (Thu, 12 Mar 2009) | 2 lines
  
  Fix logic flaw in previous commit.
........

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/svn-view/asterisk/trunk/res/res_musiconhold.c?view=diff&rev=181661&r1=181660&r2=181661
==============================================================================
--- trunk/res/res_musiconhold.c (original)
+++ trunk/res/res_musiconhold.c Thu Mar 12 11:53:52 2009
@@ -568,7 +568,7 @@
 			}
 			res = 8 * MOH_MS_INTERVAL;	/* 8 samples per millisecond */
 		}
-		if (strncasecmp(class->dir, "http://", 7) && AST_LIST_EMPTY(&class->members))
+		if ((strncasecmp(class->dir, "http://", 7) && strncasecmp(class->dir, "nodir")) && AST_LIST_EMPTY(&class->members))
 			continue;
 		/* Read mp3 audio */
 		len = ast_codec_get_len(class->format, res);