Fixed issue #5 by preventing template resolve from being executed con…

…currently
yanickrochon · Jun 2, 2015 · e65a22e · e65a22e
1 parent 1dacc7e
commit e65a22e
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/lib/engine.js b/lib/engine.js
@@ -46,6 +46,8 @@ var RenderException = require('./exceptions').RenderException;
 
 var modifiers = {};
 
+var resolverLocks = [];
+
 
 module.exports = Engine;
 
@@ -324,6 +326,14 @@ function * resolveTemplate(name, engine) {
   var file;
   var found = false;
 
+
+  if (resolverLocks.locked) {
+    yield function (done) {
+      resolverLocks.push(done);
+    };
+  }
+  resolverLocks.locked = true;
+
   if (engine.cache[name]) {
     found = engine.cache[name];
   } else {
@@ -360,6 +370,11 @@ function * resolveTemplate(name, engine) {
     }
   }
 
+  resolverLocks.locked = false;
+  if (resolverLocks.length) {
+    resolverLocks.pop()();
+  }
+
   return found;
 }