]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 234210 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Thu, 10 Dec 2009 18:57:29 +0000 (18:57 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Thu, 10 Dec 2009 18:57:29 +0000 (18:57 +0000)
https://origsvn.digium.com/svn/asterisk/trunk

........
  r234210 | tilghman | 2009-12-10 12:56:23 -0600 (Thu, 10 Dec 2009) | 2 lines

  Missed a case that emits a WARNING where none is warranted.
........

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

res/res_musiconhold.c

index b0bc5b3e0d4ff3eae9cdcbaaab5f60dcd0453f71..2df7d80e39d49e51cdb965756dc64615d85e2678 100644 (file)
@@ -620,6 +620,9 @@ static void *monmp3thread(void *data)
                                if (class->pid > 1) {
                                        do {
                                                if (killpg(class->pid, SIGHUP) < 0) {
+                                                       if (errno == ESRCH) {
+                                                               break;
+                                                       }
                                                        ast_log(LOG_WARNING, "Unable to send a SIGHUP to MOH process?!!: %s\n", strerror(errno));
                                                }
                                                usleep(100000);