[svn-commits] tilghman: branch 1.6.0 r234211 - in /branches/1.6.0: ./ res/res_musiconhold.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Dec 10 12:57:29 2009
New Revision: 234211

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=234211
Log:
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.
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/res/res_musiconhold.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/res/res_musiconhold.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/res/res_musiconhold.c?view=diff&rev=234211&r1=234210&r2=234211
==============================================================================
--- branches/1.6.0/res/res_musiconhold.c (original)
+++ branches/1.6.0/res/res_musiconhold.c Thu Dec 10 12:57:29 2009
@@ -620,6 +620,9 @@
 				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);