RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

config: fix --config-dir logic for global config files 

Global config files should be loaded only when --no-config is missing
_and_ --config-dir is not set.
This commit is contained in:
wm4 2014-02-28 21:30:29 +01:00
parent 3020490ab1
commit 42299ed868
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
options/path.c
View File

@ -125,7 +125,7 @@ char *mp_find_global_config_file(void *talloc_ctx, struct mpv_global *global,
struct MPOpts *opts = global->opts;
char *res = NULL;
if (opts->load_config || !(opts->force_configdir && opts->force_configdir[0]))
if (opts->load_config && !(opts->force_configdir && opts->force_configdir[0]))
{
if (filename) {
res = mp_path_join(talloc_ctx, bstr0(MPLAYER_CONFDIR), bstr0(filename));