aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-12-10 18:57:59 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-12-10 18:57:59 +0000
commitf63afdab463e0121835661bae1f0949c30e890de (patch)
tree320ac030d8ea62717602f1c465aec43a57e5e4f3
parentbeb80d7f04bdf4cdd9a9c3b05fce5b7db4fd32bf (diff)
Merged revisions 234210 via svnmerge from
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@234212 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--res/res_musiconhold.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 210e0643b..c85cb52af 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -617,6 +617,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);