summaryrefslogtreecommitdiffstats
path: root/player/configfiles.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-02-28 21:31:47 +0100
committerwm4 <wm4@nowhere>2014-02-28 21:32:04 +0100
commit47ede0f5e3573fb6d6f40870ed50c209a1a00a38 (patch)
tree9e914b92dd412ddc54cce4b2f36488e354a6860d /player/configfiles.c
parent42299ed868a44829801d42671e22e35468df904e (diff)
downloadmpv-47ede0f5e3573fb6d6f40870ed50c209a1a00a38.tar.bz2
mpv-47ede0f5e3573fb6d6f40870ed50c209a1a00a38.tar.xz
config: don't load global config files with --config-dir
This sidestepped the usual logic by hardcoding the path.
Diffstat (limited to 'player/configfiles.c')
-rw-r--r--player/configfiles.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/player/configfiles.c b/player/configfiles.c
index 37cf76b5fc..65e402b184 100644
--- a/player/configfiles.c
+++ b/player/configfiles.c
@@ -62,7 +62,8 @@ bool mp_parse_cfgfiles(struct MPContext *mpctx)
m_config_parse_config_file(mpctx->mconfig, conffile, 0);
#endif
- if (m_config_parse_config_file(conf, MPLAYER_CONFDIR "/mpv.conf", 0) < 0) {
+ conffile = mp_find_global_config_file(tmp, mpctx->global, "mpv.conf");
+ if (conffile && m_config_parse_config_file(conf, conffile, 0) < 0) {
r = false;
goto done;
}