summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
Diffstat (limited to 'player')
-rw-r--r--player/lua/options.lua10
1 files changed, 9 insertions, 1 deletions
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