]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 181665 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Thu, 12 Mar 2009 16:58:22 +0000 (16:58 +0000)
committerJoshua Colp <jcolp@digium.com>
Thu, 12 Mar 2009 16:58:22 +0000 (16:58 +0000)
https://origsvn.digium.com/svn/asterisk/trunk

................
  r181665 | file | 2009-03-12 13:56:58 -0300 (Thu, 12 Mar 2009) | 9 lines

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

  ........
    r181664 | file | 2009-03-12 13:56:20 -0300 (Thu, 12 Mar 2009) | 2 lines

    Fix incorrect usage of strncasecmp... I really meant to use strcasecmp.
  ........
................

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

res/res_musiconhold.c

index bfd4d499b46b086b37de221d68f6ba05d8a5dd6c..0a7e05683f76210036e332acd695f51a050a6fc4 100644 (file)
@@ -567,7 +567,7 @@ static void *monmp3thread(void *data)
                        }
                        res = 8 * MOH_MS_INTERVAL;      /* 8 samples per millisecond */
                }
-               if ((strncasecmp(class->dir, "http://", 7) && strncasecmp(class->dir, "nodir")) && AST_LIST_EMPTY(&class->members))
+               if ((strncasecmp(class->dir, "http://", 7) && strcasecmp(class->dir, "nodir")) && AST_LIST_EMPTY(&class->members))
                        continue;
                /* Read mp3 audio */
                len = ast_codec_get_len(class->format, res);