diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-16 14:39:40 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-16 14:39:40 +0000 |
| commit | 49107667a5f5cc58580e302a7bd4d3acdd0e35cd (patch) | |
| tree | 9f24dad3ca7f1b2170058ae293e6509307e136b3 /res | |
| parent | 5cc51d7f2889bdbe46595ff9448998f6228ffbe3 (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.0@164609 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -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 6b492c388..513025f49 100644 --- 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); } |