[svn-commits] file: branch 1.6.0 r181662 - in /branches/1.6.0: ./ res/res_musiconhold.c

[SVN commits to the Digium repositories]

Author: file
Date: Thu Mar 12 11:54:35 2009
New Revision: 181662

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

................
  r181661 | file | 2009-03-12 13:53:52 -0300 (Thu, 12 Mar 2009) | 19 lines
  
  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:
    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/svn-view/asterisk/branches/1.6.0/res/res_musiconhold.c?view=diff&rev=181662&r1=181661&r2=181662
==============================================================================
--- branches/1.6.0/res/res_musiconhold.c (original)
+++ branches/1.6.0/res/res_musiconhold.c Thu Mar 12 11:54:35 2009
@@ -595,7 +595,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);