aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Stefano Pigozzi <stefano.pigozzi@gmail.com>2014-12-26 09:10:30 +0100
committerGravatar Stefano Pigozzi <stefano.pigozzi@gmail.com>2014-12-26 09:18:20 +0100
commite01a6dac98b0e83881d345eaaac292aff8bad616 (patch)
treedceffc6d7fb05b6f8e778fcf79969ccbcc6706c0
parent8721ba08a5a4a89cfb04d87cf0ce61ee341a4903 (diff)
osxbundle: fix cascading config loading
mpv does 'cascading' configs by overriding options as the config become more important (bundle -> system level -> user level). Unfortunately mpv also loads two sets of configs files one after the other [1]. First it looks for 'config', then for 'mpv.conf'. For this reason a mpv.conf in ANY location will override ANY config files named config (even if the mpv.conf is in a system path and config in a user path). [1]: Relevant code in player/configfiles.c load_all_cfgfiles(mpctx, section, "config"); load_all_cfgfiles(mpctx, section, "mpv.conf"); Fixes: #1361
-rw-r--r--TOOLS/osxbundle/mpv.app/Contents/Resources/config (renamed from TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf)0
1 files changed, 0 insertions, 0 deletions
diff --git a/TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf b/TOOLS/osxbundle/mpv.app/Contents/Resources/config
index ff78dfacf6..ff78dfacf6 100644
--- a/TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf
+++ b/TOOLS/osxbundle/mpv.app/Contents/Resources/config