[svn-commits] russell: branch 1.6.0 r164609 - in /branches/1.6.0: ./ res/res_musiconhold.c

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Dec 16 08:39:40 2008
New Revision: 164609

URL: http://svn.digium.com/view/asterisk?view=rev&rev=164609
Log:
Merged revisions 164606 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r164606 | russell | 2008-12-16 08:31:02 -0600 (Tue, 16 Dec 2008) | 13 lines

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

........
r164605 | russell | 2008-12-16 08:28:10 -0600 (Tue, 16 Dec 2008) | 5 lines

Don't try to change working directory if a directory was not configured.

(closes issue #14089)
Reported by: caspy

........

................

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://svn.digium.com/view/asterisk/branches/1.6.0/res/res_musiconhold.c?view=diff&rev=164609&r1=164608&r2=164609
==============================================================================
--- branches/1.6.0/res/res_musiconhold.c (original)
+++ branches/1.6.0/res/res_musiconhold.c Tue Dec 16 08:39:40 2008
@@ -523,7 +523,7 @@
 			}
 		}
 		/* Child */
-		if (chdir(class->dir) < 0) {
+		if (strcasecmp(class->dir, "nodir") && chdir(class->dir) < 0) {
 			ast_log(LOG_WARNING, "chdir() failed: %s\n", strerror(errno));
 			_exit(1);
 		}