diff options
author | wm4 <wm4@nowhere> | 2014-02-28 21:30:29 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-02-28 21:32:00 +0100 |
commit | 42299ed868a44829801d42671e22e35468df904e (patch) | |
tree | e8c3dc91e708204d57f71a4d034bea7d70bc0c00 /options | |
parent | 3020490ab1704ef876662d7d28aa71c26da30a62 (diff) | |
download | mpv-42299ed868a44829801d42671e22e35468df904e.tar.bz2 mpv-42299ed868a44829801d42671e22e35468df904e.tar.xz |
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.
Diffstat (limited to 'options')
-rw-r--r-- | options/path.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/options/path.c b/options/path.c index f0570cac8e..53ce3a5282 100644 --- a/options/path.c +++ b/options/path.c @@ -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)); |