From 709ce34a8dc884fe70bbc9af4397a3ec295a9e2f Mon Sep 17 00:00:00 2001 From: rxi Date: Sun, 9 Mar 2014 01:40:05 +0000 Subject: [PATCH] Fixed wrapper bug when doing manual lurker.scan() --- lurker.lua | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/lurker.lua b/lurker.lua index 5fb6bb6..299d1d2 100644 --- a/lurker.lua +++ b/lurker.lua @@ -128,17 +128,25 @@ function lurker.onerror(e) end -function lurker.onfirstframe() +function lurker.exitinitstate() + lurker.state = "normal" if lurker.protected then lurker.initwrappers() end end +function lurker.exiterrorstate() + lurker.state = "normal" + for _, v in pairs(lovecallbacknames) do + love[v] = lurker.funcwrappers[v] + end +end + + function lurker.update() if lurker.state == "init" then - lurker.onfirstframe() - lurker.state = "normal" + lurker.exitinitstate() end local diff = time() - lurker.last if diff > lurker.interval then @@ -166,14 +174,6 @@ function lurker.resetfile(f) end -function lurker.exiterrorstate() - lurker.state = "normal" - for _, v in pairs(lovecallbacknames) do - love[v] = lurker.funcwrappers[v] - end -end - - function lurker.hotswapfile(f) lurker.print("Hotswapping '{1}'...", {f}) if lurker.state == "error" then @@ -196,6 +196,9 @@ end function lurker.scan() + if lurker.state == "init" then + lurker.exitinitstate() + end lume.each(lurker.getchanged(), lurker.hotswapfile) end