From e01a6dac98b0e83881d345eaaac292aff8bad616 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Fri, 26 Dec 2014 09:10:30 +0100 Subject: [PATCH] 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 --- TOOLS/osxbundle/mpv.app/Contents/Resources/{mpv.conf => config} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename TOOLS/osxbundle/mpv.app/Contents/Resources/{mpv.conf => config} (100%) diff --git a/TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf b/TOOLS/osxbundle/mpv.app/Contents/Resources/config similarity index 100% rename from TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf rename to TOOLS/osxbundle/mpv.app/Contents/Resources/config