From e01a6dac98b0e83881d345eaaac292aff8bad616 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Fri, 26 Dec 2014 09:10:30 +0100 Subject: 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/config | 3 +++ TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 TOOLS/osxbundle/mpv.app/Contents/Resources/config delete mode 100644 TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf (limited to 'TOOLS/osxbundle') diff --git a/TOOLS/osxbundle/mpv.app/Contents/Resources/config b/TOOLS/osxbundle/mpv.app/Contents/Resources/config new file mode 100644 index 0000000000..ff78dfacf6 --- /dev/null +++ b/TOOLS/osxbundle/mpv.app/Contents/Resources/config @@ -0,0 +1,3 @@ +screenshot-template=~/Desktop/shot%n +quiet +idle=once diff --git a/TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf b/TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf deleted file mode 100644 index ff78dfacf6..0000000000 --- a/TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf +++ /dev/null @@ -1,3 +0,0 @@ -screenshot-template=~/Desktop/shot%n -quiet -idle=once -- cgit v1.2.3