2016-08-09 22:01:00

1 files changed, 10 insertions, 4 deletions

diff --git a/tex/context/base/mkiv/core-uti.lua b/tex/context/base/mkiv/core-uti.lua
index 1ddfffaf2..54bcba08d 100644
--- a/tex/context/base/mkiv/core-uti.lua
+++ b/tex/context/base/mkiv/core-uti.lua
@@ -283,21 +283,27 @@ function job.load(filename)
     local utilitydata = load(filename)
     if utilitydata then
         local jobpacker = utilitydata.job.packed
-        for l=1,#savelist do
-            local list        = savelist[l]
+        local handlers  = { }
+        for i=1,#savelist do
+            local list        = savelist[i]
             local target      = list[1]
             local initializer = list[3]
             local result      = accesstable(target,utilitydata)
-            local done = packers.unpack(result,jobpacker,true)
+            local done        = packers.unpack(result,jobpacker,true)
             if done then
                 migratetable(target,mark(result))
                 if type(initializer) == "function" then
-                    initializer(result)
+                    handlers[#handlers+1] = { initializer, result }
                 end
             else
                 report_passes("pack version mismatch")
             end
         end
+        -- so we have all tables available (unpacked)
+        for i=1,#handlers do
+            local handler = handlers[i]
+            handler[1](handler[2])
+        end
     end
     statistics.stoptiming(_load_)
 end