AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-17 11:15:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Prevent error loops in xpcall.

Browse Source
This commit is contained in:
Florian Nücke 2014-06-28 18:52:11 +02:00
parent c4986eeb82
commit 009e51b288
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/resources/assets/opencomputers/lua/kernel.lua
View File

@ -99,8 +99,16 @@ sandbox = {
tostring = tostring, tostring = tostring,
type = type, type = type,
_VERSION = "Lua 5.2", _VERSION = "Lua 5.2",
xpcall = function(...) xpcall = function(f, msgh, ...)
local result = table.pack(xpcall(...)) local handled = false
local result = table.pack(xpcall(f, function(...)
if handled then
return ...
else
handled = true
return msgh(...)
end
end, ...))
checkDeadline() checkDeadline()
return table.unpack(result, 1, result.n) return table.unpack(result, 1, result.n)
end, end,