Fix #5560 - Gitlive - branching wip
[gitlive] / Spawn.vala
index 704f165..738ea44 100644 (file)
@@ -370,7 +370,7 @@ public class Spawn : Object
 
             }
             //print("child process done - running callback, then tidyup");
-            this.on_finished(this.result, this.output);
+            this.on_finished(this.result, this.output + (this.output.length > 0 ? "\n" : "") + this.stderr);
            // this.unref();
             this.tidyup();
             
@@ -404,7 +404,7 @@ public class Spawn : Object
         //if (this.out_src > -1 ) GLib.source_remove(this.out_src);
         this.err_src = -1;
         this.out_src = -1;
-        this.unref();
+        //this.unref();
     }