From 42299ed868a44829801d42671e22e35468df904e Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 28 Feb 2014 21:30:29 +0100 Subject: 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. --- options/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'options') 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)); -- cgit v1.2.3