Fixed problem with FrameworkImage.save() and CLEANUP().

petersirka · petersirka · commit 07e043bed621 · 2016-03-22T21:30:24.000+01:00
diff --git a/changes.txt b/changes.txt
@@ -4,6 +4,8 @@
 - fixed: `F.websocket()` input arguments by @claudioquaglia
 - fixed: Schema parsing
 - fixed: view looping
+- fixed: `FrameworkImage.save()` problem with streams
+- fixed: `CLEANUP(stream)` method
 
 ======= 1.9.7
 
diff --git a/image.js b/image.js
@@ -21,7 +21,7 @@
 
 /**
  * @module FrameworkImage
- * @version 1.9.7
+ * @version 1.9.8
  */
 
 'use strict';
@@ -234,10 +234,6 @@ Image.prototype.save = function(filename, callback, writer) {
 
 	var cmd = exec(command, function(error, stdout, stderr) {
 
-		FINISHED(stdout, function() {
-			DESTROY(stdout);
-		});
-
  		// clean up
 		cmd.kill();
 		cmd = null;
@@ -274,9 +270,7 @@ Image.prototype.save = function(filename, callback, writer) {
 			self.currentStream.pipe(cmd.stdin);
 	}
 
-	FINISHED(cmd.stdin, function() {
-		DESTROY(cmd.stdin);
-	});
+	CLEANUP(cmd.stdin);
 
 	if (writer)
 		writer(cmd.stdin);
diff --git a/index.js b/index.js
@@ -336,24 +336,10 @@ global.CLEANUP = function(stream, callback) {
 		});
 	};
 
-	if (stream.readable) {
-		if (stream.path) {
-			stream.on('end', fn);
-			return;
-		}
-	} else {
-		if (stream.path) {
-			stream.on('finish', fn);
-			return;
-		}
-	}
-
-	fn = null;
-	FINISHED(stream, function() {
-		if (callback)
-			callback();
-		DESTROY(stream);
-	});
+	if (stream.readable)
+		stream.on('end', fn);
+	else
+		stream.on('finish', fn);
 };
 
 global.SUCCESS = function(success, value) {
