fixes i'm not sure about

thenables · Dec 22, 2014 · 4395cda · 4395cda
1 parent a5d5bf3
commit 4395cda
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/master.js b/master.js
@@ -61,8 +61,8 @@ function Master(filename, options) {
         proc.removeListener('message', onmessage)
         proc.queue--
         proc._maxListeners--
-        if ('value' in res) return resolve(res.value)
-        else reject(JSONToError(res.error))
+        if ('error' in res) return reject(JSONToError(res.error))
+        resolve(res.value)
       })
 
       proc.send({

diff --git a/slave.js b/slave.js
@@ -16,8 +16,7 @@ module.exports = function (fn) {
       return
     }
 
-    if (isGenerator(thing)) thing = co(thing)
-    Promise.resolve(thing).then(function (val) {
+    Promise.resolve(isGenerator(thing) ? co(thing) : thing).then(function (val) {
       process.send({
         id: m.id,
         value: val