Merge branch 'master' into background-image

This commit is contained in:
Matt Rose 2020-09-29 10:06:21 -04:00
commit e06003ee41
1 changed files with 8 additions and 12 deletions

View File

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