Fixes #364

src/promise.js

@@ -682,6 +682,7 @@ function Promise$_settlePromiseFromHandler(
         handler.call(receiver, value, promise);
         return;
     }
+    if (promise.isResolved()) return;
     var x = this._callHandler(handler, receiver, promise, value);
     if (promise._isFollowing()) return;
 

test/mocha/github-3.6.4.js

@@ -0,0 +1,40 @@
+"use strict";
+
+var assert = require("assert");
+var Promise = require("../../js/debug/bluebird.js");
+
+function defer() {
+    var resolve, reject;
+    var promise = new Promise(function() {
+        resolve = arguments[0];
+        reject = arguments[1];
+    });
+    return {
+        resolve: resolve,
+        reject: reject,
+        promise: promise
+    };
+}
+
+
+describe("github-364", function() {
+    specify("resolve between thens", function(done) {
+        var calls = 0;
+        var def = defer();
+
+        def.promise.then(function() {
+            calls++
+        });
+        def.resolve();
+        def.promise.then(function() {
+            calls++
+        }).then(function() {
+            calls++
+        });
+
+        Promise.delay(50).then(function() {
+            assert.equal(calls, 3);
+            done();
+        });
+    });
+});