From 47ede0f5e3573fb6d6f40870ed50c209a1a00a38 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 28 Feb 2014 21:31:47 +0100
Subject: config: don't load global config files with --config-dir

This sidestepped the usual logic by hardcoding the path.
---
 player/configfiles.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'player/configfiles.c')

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;
     }
-- 
cgit v1.2.3