circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-17 18:08:51 +00:00
Code Issues Projects Releases Wiki Activity

Don't copy default command, use NULL if specified to use previous command.

Browse Source
This commit is contained in:
Nicholas Marriott 2008-06-30 18:45:02 +00:00
parent 80a594cae3
commit 8969a8beaf
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd-respawn-window.c
View File

@ -1,4 +1,4 @@
/* $Id: cmd-respawn-window.c,v 1.1 2008-06-29 07:04:30 nicm Exp $ */ /* $Id: cmd-respawn-window.c,v 1.2 2008-06-30 18:45:02 nicm Exp $ */
/* /*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@ -46,7 +46,6 @@ cmd_respawn_window_exec(struct cmd *self, struct cmd_ctx *ctx)
struct winlink *wl; struct winlink *wl;
struct session *s; struct session *s;
const char *env[] = { NULL, "TERM=screen", NULL }; const char *env[] = { NULL, "TERM=screen", NULL };
char *cmd;
if ((wl = cmd_find_window(ctx, data->target, &s)) == NULL) if ((wl = cmd_find_window(ctx, data->target, &s)) == NULL)
return; return;
@ -56,11 +55,7 @@ cmd_respawn_window_exec(struct cmd *self, struct cmd_ctx *ctx)
return; return;
} }
cmd = data->arg; if (window_spawn(wl->window, data->arg, env) != 0) {
if (cmd == NULL)
cmd = options_get_string(&s->options, "default-command");
if (window_spawn(wl->window, cmd, env) != 0) {
ctx->error(ctx, "respawn failed: %s:%d", s->name, wl->idx); ctx->error(ctx, "respawn failed: %s:%d", s->name, wl->idx);
return; return;
} }