RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-03 05:31:34 +00:00
Code Issues Releases Wiki Activity

auto_profiles: fix compile_cond on lua 5.1

Browse Source 
5.1's load() doesn't accept strings; loadstring must be used instead.

In 5.2, loadstring is deprecated and setfenv is gone.
This commit is contained in:
Philip Sequeira 2020-12-02 01:38:39 -05:00 committed by Dudemanguy
parent 36e569b242
commit df805cfc84
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
player/lua/auto_profiles.lua
View File

@ -136,16 +136,20 @@ setmetatable(p, {
}) })
local function compile_cond(name, s) local function compile_cond(name, s)
-- (pre 5.2 ignores the extra arguments) local code, chunkname = "return " .. s, "profile " .. name .. " condition"
local chunk, err = load("return " .. s, "profile " .. name .. " condition", local chunk, err
"t", evil_magic) if setfenv then -- lua 5.1
chunk, err = loadstring(code, chunkname)
if chunk then
setfenv(chunk, evil_magic)
end
else -- lua 5.2
chunk, err = load(code, chunkname, "t", evil_magic)
end
if not chunk then if not chunk then
msg.error("Profile '" .. name .. "' condition: " .. err) msg.error("Profile '" .. name .. "' condition: " .. err)
chunk = function() return false end chunk = function() return false end
end end
if setfenv then
setfenv(chunk, evil_magic)
end
return chunk return chunk
end end