diff --git a/multi/init.lua b/multi/init.lua index c5d3bf8..0372e76 100644 --- a/multi/init.lua +++ b/multi/init.lua @@ -777,7 +777,7 @@ function multi:threadloop(settings) _,ret=coroutine.resume(Threads[i].thread,Globals) end if _==false then - self.Parent.OnError:Fire(Threads[i],"Error in thread: <"..Threads[i].Name.."> "..ret) + multi.OnError:Fire(Threads[i],"Error in thread: <"..Threads[i].Name.."> "..ret) end if ret==true or ret==false then ret={} diff --git a/multi/integration/loveManager.lua b/multi/integration/loveManager.lua index 62b5655..e5d8121 100644 --- a/multi/integration/loveManager.lua +++ b/multi/integration/loveManager.lua @@ -15,7 +15,7 @@ require("love.filesystem") require("love.system") require("love.timer") require("love.image") -require("multi") +local multi = require("multi") GLOBAL={} isMainThread=false setmetatable(GLOBAL,{ diff --git a/multi/integration/shared.lua b/multi/integration/shared.lua index c17f733..d812dbd 100644 --- a/multi/integration/shared.lua +++ b/multi/integration/shared.lua @@ -473,7 +473,6 @@ function multi:newSystemThreadedJobQueue(numOfCores) while data do if data then local a=unpack(data) - print(a) if a=="_THREADINIT_" then self.link.threadsResponded=self.link.threadsResponded+1 if self.link.threadsResponded==self.link.cores then