diff options
Diffstat (limited to 'options')
-rw-r--r-- | options/options.c | 2 | ||||
-rw-r--r-- | options/path.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/options/options.c b/options/options.c index 71aea336b1..45f4217a2e 100644 --- a/options/options.c +++ b/options/options.c @@ -132,7 +132,7 @@ const m_option_t mp_opts[] = { {"belownormal", BELOW_NORMAL_PRIORITY_CLASS}, {"idle", IDLE_PRIORITY_CLASS})), #endif - OPT_FLAG("config", load_config, CONF_GLOBAL | CONF_NOCFG | CONF_PRE_PARSE), + OPT_FLAG("config", load_config, CONF_GLOBAL | CONF_PRE_PARSE), OPT_STRING("config-dir", force_configdir, CONF_GLOBAL | CONF_NOCFG | CONF_PRE_PARSE), OPT_STRINGLIST("reset-on-next-file", reset_options, M_OPT_GLOBAL), diff --git a/options/path.c b/options/path.c index 08d16fe944..29ebcd9277 100644 --- a/options/path.c +++ b/options/path.c @@ -76,10 +76,12 @@ static const char *mp_get_platform_path(void *talloc_ctx, const char *force_configdir = getenv("MPV_HOME"); if (global->opts->force_configdir && global->opts->force_configdir[0]) force_configdir = global->opts->force_configdir; + if (!global->opts->load_config) + force_configdir = ""; if (force_configdir) { for (int n = 0; n < MP_ARRAY_SIZE(config_dirs); n++) { if (strcmp(config_dirs[n], type) == 0) - return n == 0 ? force_configdir : NULL; + return (n == 0 && force_configdir[0]) ? force_configdir : NULL; } } |