From 9eadc068fa13b8d83ad049e83960883d06d3c125 Mon Sep 17 00:00:00 2001 From: "Avi Halachmi (:avih)" Date: Wed, 13 Dec 2017 19:37:42 +0200 Subject: config: replace config dir lua-settings/ with dir script-opts/ lua-settings/ is still supported, with deprecation warning. --- player/lua/options.lua | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'player') diff --git a/player/lua/options.lua b/player/lua/options.lua index dd76f7ace7..4d05587ef1 100644 --- a/player/lua/options.lua +++ b/player/lua/options.lua @@ -37,8 +37,16 @@ local function read_options(options, identifier) msg.debug("reading options for " .. identifier) -- read config file - local conffilename = "lua-settings/" .. identifier .. ".conf" + local conffilename = "script-opts/" .. identifier .. ".conf" local conffile = mp.find_config_file(conffilename) + if conffile == nil then + msg.verbose(conffilename .. " not found.") + conffilename = "lua-settings/" .. identifier .. ".conf" + conffile = mp.find_config_file(conffilename) + if conffile then + msg.warn("lua-settings/ is deprecated, use directory script-opts/") + end + end local f = conffile and io.open(conffile,"r") if f == nil then -- config not found -- cgit v1.2.3