diff options
| author | Joshua Colp <jcolp@digium.com> | 2009-03-12 16:53:52 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2009-03-12 16:53:52 +0000 |
| commit | e12265e5304d9f2c4a857f757b98c175c1f5f43e (patch) | |
| tree | f4fdd6d3d103712ea3f50d190df15e79c376bccf /res/res_musiconhold.c | |
| parent | a80c5e37afc5ff3a5f974bad3fa4ab756ba6cb11 (diff) | |
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/trunk@181661 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_musiconhold.c')
| -rw-r--r-- | res/res_musiconhold.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index e9439cf65..a9fdc2746 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -568,7 +568,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); |