mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-04 13:29:59 -05:00
Don't abort config loading when the user specific cannot be loaded.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1423 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
4171f2504a
commit
f65ab1b3eb
1 changed files with 8 additions and 2 deletions
|
|
@ -953,13 +953,19 @@ FILE *pa_open_config_file(const char *global, const char *local, const char *env
|
||||||
fn = buf;
|
fn = buf;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if ((f = fopen(fn, mode)) || errno != ENOENT) {
|
f = fopen(fn, mode);
|
||||||
|
if (f != NULL) {
|
||||||
if (result)
|
if (result)
|
||||||
*result = pa_xstrdup(fn);
|
*result = pa_xstrdup(fn);
|
||||||
pa_xfree(lfn);
|
pa_xfree(lfn);
|
||||||
return f;
|
return f;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (errno != ENOENT) {
|
||||||
|
pa_log_warn("WARNING: failed to open configuration file '%s': %s",
|
||||||
|
lfn, pa_cstrerror(errno));
|
||||||
|
}
|
||||||
|
|
||||||
pa_xfree(lfn);
|
pa_xfree(lfn);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue