From b1e3c1088ca84fa30c2e548f8cd2258155bc3e8d Mon Sep 17 00:00:00 2001 From: lethosor Date: Wed, 19 Oct 2016 09:51:48 -0400 Subject: [PATCH] Give loadfile() result a better name for tracebacks --- library/lua/dfhack.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/library/lua/dfhack.lua b/library/lua/dfhack.lua index 900607c08..340b6ce64 100644 --- a/library/lua/dfhack.lua +++ b/library/lua/dfhack.lua @@ -543,23 +543,23 @@ function dfhack.run_script_with_env(envVars, name, flags, ...) end env.dfhack_flags = flags env.moduleMode = flags.module - local f + local script_code local perr local time = dfhack.filesystem.mtime(file) if time == scripts[file].mtime and scripts[file].run then - f = scripts[file].run + script_code = scripts[file].run else --reload - f, perr = loadfile(file, 't', env) - if not f then + script_code, perr = loadfile(file, 't', env) + if not script_code then error(perr) end -- avoid updating mtime if the script failed to load scripts[file].mtime = time end scripts[file].env = env - scripts[file].run = f - return f(...), env + scripts[file].run = script_code + return script_code(...), env end local function _run_command(...)