diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-12-13 16:01:13 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-12-13 16:01:13 +0000 |
| commit | ae5ddfdc1ae471f13c6d0e94ff4029d4fb29e1f4 (patch) | |
| tree | 72ebffc1c0617c28ddc421f24045f148b7d59e36 /cmd-respawn-window.c | |
| parent | 92f187d1c2d84322860dc595da604260999a52f0 (diff) | |
| parent | ff599f4004aaa6aae325ece5cbc996e2dc6f0b4f (diff) | |
| download | rtmux-ae5ddfdc1ae471f13c6d0e94ff4029d4fb29e1f4.tar.gz rtmux-ae5ddfdc1ae471f13c6d0e94ff4029d4fb29e1f4.tar.bz2 rtmux-ae5ddfdc1ae471f13c6d0e94ff4029d4fb29e1f4.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-respawn-window.c')
| -rw-r--r-- | cmd-respawn-window.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/cmd-respawn-window.c b/cmd-respawn-window.c index 93af1b68..f6550dee 100644 --- a/cmd-respawn-window.c +++ b/cmd-respawn-window.c @@ -33,7 +33,7 @@ const struct cmd_entry cmd_respawn_window_entry = { "respawn-window", "respawnw", "kt:", 0, -1, "[-k] " CMD_TARGET_WINDOW_USAGE " [command]", - 0, + CMD_WINDOW_T, cmd_respawn_window_exec }; @@ -41,25 +41,21 @@ enum cmd_retval cmd_respawn_window_exec(struct cmd *self, struct cmd_q *cmdq) { struct args *args = self->args; - struct winlink *wl; - struct window *w; + struct session *s = cmdq->state.tflag.s; + struct winlink *wl = cmdq->state.tflag.wl; + struct window *w = wl->window; struct window_pane *wp; - struct session *s; struct environ *env; const char *path; char *cause; struct environ_entry *envent; - if ((wl = cmd_find_window(cmdq, args_get(args, 't'), &s)) == NULL) - return (CMD_RETURN_ERROR); - w = wl->window; - if (!args_has(self->args, 'k')) { TAILQ_FOREACH(wp, &w->panes, entry) { if (wp->fd == -1) continue; - cmdq_error(cmdq, - "window still active: %s:%d", s->name, wl->idx); + cmdq_error(cmdq, "window still active: %s:%d", s->name, + wl->idx); return (CMD_RETURN_ERROR); } } |