diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-16 14:47:34 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-16 14:47:34 +0000 |
| commit | a15734dc9ea42e1987cf4cfdce36d2fb3f38144c (patch) | |
| tree | 49a7b437c3747ef97f295f997783da82e64bbc89 | |
| parent | 83e19f90226aef20de463ba68d2bc7186ecf0372 (diff) | |
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
| -rw-r--r-- | res/res_musiconhold.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); } |