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

........

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

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

diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 6b492c388481409326fcd42181d46311be20644f..513025f493bc04f3a9d891e2085d142ec0aa8f6d 100644 (file)
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -523,7 +523,7 @@ static int spawn_mp3(struct mohclass *class)
                        }
                }
                /* 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);
                }