diff options
| author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2014-12-26 09:10:30 +0100 |
|---|---|---|
| committer | Alessandro Ghedini <alessandro@ghedini.me> | 2015-01-14 17:03:29 +0100 |
| commit | bde22281f7b6da90c4310a2e67212b136150ec07 (patch) | |
| tree | f6f4227e9b03549b8b04675c0e896a967eb1d3b2 | |
| parent | 697a7b7d19abc9b0978576f1dee657240243119b (diff) | |
| download | mpv-bde22281f7b6da90c4310a2e67212b136150ec07.tar.bz2 mpv-bde22281f7b6da90c4310a2e67212b136150ec07.tar.xz | |
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 9567c28636..9567c28636 100644 --- a/TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf +++ b/TOOLS/osxbundle/mpv.app/Contents/Resources/config |