Fix order of events in _preview

jmonster · Aug 28, 2013 · 776b68b · 776b68b
1 parent e1f0eba
commit 776b68b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/lib/response/generic.js b/lib/response/generic.js
@@ -189,9 +189,13 @@ internals.Generic.prototype._transmit = function (request, callback) {
             }
         }
 
+        self._preview.on('finish', function () {
+
+            self._preview.removeAllListeners();
+            end();
+        });
+
         self._preview.end();
-        self._preview.removeAllListeners();
-        end();
     };
 
     prepare();

diff --git a/lib/response/stream.js b/lib/response/stream.js
@@ -164,15 +164,19 @@ internals.Stream.prototype._transmit = function (request, callback) {
                 request.raw.res.end();
             }
 
+            self._preview.on('finish', function () {
+
+                self._preview.removeAllListeners();
+                self._stream.removeAllListeners();
+
+                callback();
+            });
+
             self._preview.end();
-            self._preview.removeAllListeners();
-            self._stream.removeAllListeners();
 
             if (self._stream.destroy) {
                 self._stream.destroy();
             }
-
-            callback();
         }
     };