RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-18 04:45:33 +00:00
Code Issues Releases Wiki Activity

config: don't load global config files with --config-dir

Browse Source 
This sidestepped the usual logic by hardcoding the path.
This commit is contained in:
wm4 2014-02-28 21:31:47 +01:00
parent 42299ed868
commit 47ede0f5e3
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
player/configfiles.c
View File

@ -62,7 +62,8 @@ bool mp_parse_cfgfiles(struct MPContext *mpctx)
m_config_parse_config_file(mpctx->mconfig, conffile, 0); m_config_parse_config_file(mpctx->mconfig, conffile, 0);
#endif #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; r = false;
goto done; goto done;
} }