summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/spawn.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2019-10-07 07:14:07 +0000
committernicm <nicm@openbsd.org>2019-10-07 07:14:07 +0000
commita74bab06fff14c0dc1d1e816fe00d02ae7068611 (patch)
tree9a9c06405639255431a50389d7dda8d54409ddc9 /usr.bin/tmux/spawn.c
parentRestart the send queue (rather than just clearing OACTIVE) when we've (diff)
downloadwireguard-openbsd-a74bab06fff14c0dc1d1e816fe00d02ae7068611.tar.xz
wireguard-openbsd-a74bab06fff14c0dc1d1e816fe00d02ae7068611.zip
Fix respawn-pane/window if default-command is set, reported by Janos Barbero.
Diffstat (limited to 'usr.bin/tmux/spawn.c')
-rw-r--r--usr.bin/tmux/spawn.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/tmux/spawn.c b/usr.bin/tmux/spawn.c
index cbcff729f0e..0b5ec462c53 100644
--- a/usr.bin/tmux/spawn.c
+++ b/usr.bin/tmux/spawn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spawn.c,v 1.9 2019/09/23 15:41:11 nicm Exp $ */
+/* $OpenBSD: spawn.c,v 1.10 2019/10/07 07:14:07 nicm Exp $ */
/*
* Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -253,7 +253,7 @@ spawn_pane(struct spawn_context *sc, char **cause)
* Now we have a pane with nothing running in it ready for the new
* process. Work out the command and arguments.
*/
- if (sc->argc == 0) {
+ if (sc->argc == 0 && (~sc->flags & SPAWN_RESPAWN)) {
cmd = options_get_string(s->options, "default-command");
if (cmd != NULL && *cmd != '\0') {
argc = 1;