Merge branch 'master' into background-image

2020-09-29 10:06:21 -04:00 · 2020-09-29 10:06:21 -04:00 · e06003ee41
parent 8d85beaafa a84bed91cf
commit e06003ee41
1 changed files with 8 additions and 12 deletions
--- a/terminatorlib/terminal.py
+++ b/terminatorlib/terminal.py
@ -1513,17 +1513,13 @@ class Terminal(Gtk.VBox):

        dbg('Forking shell: "%s" with args: %s' % (shell, args))
        args.insert(0, shell)
-        self.pid = self.vte.spawn_async(
-            Vte.PtyFlags.DEFAULT,
+        result,  self.pid = self.vte.spawn_sync(Vte.PtyFlags.DEFAULT,
                                       self.cwd,
                                       args,
                                       envv,
                                       GLib.SpawnFlags.FILE_AND_ARGV_ZERO | GLib.SpawnFlags.DO_NOT_REAP_CHILD,
                                       None,
                                       None,
-            -1,
-            None,
-            None,
                                       None)
        self.command = shell