From a15734dc9ea42e1987cf4cfdce36d2fb3f38144c Mon Sep 17 00:00:00 2001 From: russell Date: Tue, 16 Dec 2008 14:47:34 +0000 Subject: 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: http://svn.digium.com/svn/asterisk/branches/1.6.1@164614 f38db490-d61c-443f-a65b-d21fe96a405b --- res/res_musiconhold.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index 2f75baa97..e3f0594a8 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -511,7 +511,7 @@ static int spawn_mp3(struct mohclass *class) ast_close_fds_above_n(STDERR_FILENO); /* 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); } -- cgit v1.2.3