fix merges

[roobuilder] / src / Spawn.vala

diff --git a/src/Spawn.vala b/src/Spawn.vala
index 7b63163..cac96f3 100644 (file)
--- a/src/Spawn.vala
+++ b/src/Spawn.vala
@@ -164,7 +164,7 @@ public class Spawn : Object
                        Process.spawn_async (   
                                this.cwd,
                                this.args,
-                               this.env.length > 0 ? this.env : GLib.Environ.get (),
+                               this.env.length > 0 ? this.env : null,
                                SpawnFlags.SEARCH_PATH | SpawnFlags.DO_NOT_REAP_CHILD,
                                null,
                                out pid);
@@ -234,10 +234,6 @@ public class Spawn : Object
                                this.ctx.quit();
                                this.ctx = null;
                        }
-                       // since it's closed - we might not need to remove the watches?
-                       
-                       this.err_src = -1;
-                       this.out_src = -1;
                        this.tidyup();
                        GLib.debug("DONE TIDYUP - calling complete");