diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-05-06 10:03:52 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-05-06 10:03:52 +0100 |
| commit | f10d3675f8d86e76b5b04d8473b83a9eec778ab3 (patch) | |
| tree | 3e56aa430262591d01934fd7e1a9ec8e07d4d120 /cmd-kill-window.c | |
| parent | c0cf4843e50ae7b123613798c209f30440d73e55 (diff) | |
| parent | 31b1ab48521b4b608d87abd5413441905da84da8 (diff) | |
| download | rtmux-f10d3675f8d86e76b5b04d8473b83a9eec778ab3.tar.gz rtmux-f10d3675f8d86e76b5b04d8473b83a9eec778ab3.tar.bz2 rtmux-f10d3675f8d86e76b5b04d8473b83a9eec778ab3.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-kill-window.c')
| -rw-r--r-- | cmd-kill-window.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/cmd-kill-window.c b/cmd-kill-window.c index d402acce..4d346a71 100644 --- a/cmd-kill-window.c +++ b/cmd-kill-window.c @@ -45,24 +45,17 @@ const struct cmd_entry cmd_unlink_window_entry = { enum cmd_retval cmd_kill_window_exec(struct cmd *self, struct cmd_q *cmdq) { - struct args *args = self->args; - struct winlink *wl, *wl2, *wl3; - struct window *w; - struct session *s; - struct session_group *sg; - u_int references; + struct args *args = self->args; + struct winlink *wl, *wl2, *wl3; + struct window *w; + struct session *s; if ((wl = cmd_find_window(cmdq, args_get(args, 't'), &s)) == NULL) return (CMD_RETURN_ERROR); w = wl->window; if (self->entry == &cmd_unlink_window_entry) { - sg = session_group_find(s); - if (sg != NULL) - references = session_group_count(sg); - else - references = 1; - if (!args_has(self->args, 'k') && w->references == references) { + if (!args_has(self->args, 'k') && !session_is_linked(s, w)) { cmdq_error(cmdq, "window only linked to one session"); return (CMD_RETURN_ERROR); } |