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.
  ........
................

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

diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 594b667e14b8163137f99c307276684c1d226573..bfd4d499b46b086b37de221d68f6ba05d8a5dd6c 100644 (file)
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -567,7 +567,7 @@ static void *monmp3thread(void *data)
                        }
                        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);