mirror of
https://github.com/tmate-io/tmate.git
synced 2024-11-08 09:14:22 +01:00
Now that the queue _SAFE macros are available, use them instead of rolling
our own. This is analogous to the recent changes to the detach-client and kill-{session,window} commands.
This commit is contained in:
parent
7a583b1e54
commit
81858d7891
@ -43,7 +43,7 @@ cmd_kill_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
|
|||||||
{
|
{
|
||||||
struct args *args = self->args;
|
struct args *args = self->args;
|
||||||
struct winlink *wl;
|
struct winlink *wl;
|
||||||
struct window_pane *loopwp, *nextwp, *wp;
|
struct window_pane *loopwp, *tmpwp, *wp;
|
||||||
|
|
||||||
if ((wl = cmd_find_pane(ctx, args_get(args, 't'), NULL, &wp)) == NULL)
|
if ((wl = cmd_find_pane(ctx, args_get(args, 't'), NULL, &wp)) == NULL)
|
||||||
return (CMD_RETURN_ERROR);
|
return (CMD_RETURN_ERROR);
|
||||||
@ -56,14 +56,11 @@ cmd_kill_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (args_has(self->args, 'a')) {
|
if (args_has(self->args, 'a')) {
|
||||||
loopwp = TAILQ_FIRST(&wl->window->panes);
|
TAILQ_FOREACH_SAFE(loopwp, &wl->window->panes, entry, tmpwp) {
|
||||||
while (loopwp != NULL) {
|
if (loopwp == wp)
|
||||||
nextwp = TAILQ_NEXT(loopwp, entry);
|
continue;
|
||||||
if (loopwp != wp) {
|
layout_close_pane(loopwp);
|
||||||
layout_close_pane(loopwp);
|
window_remove_pane(wl->window, loopwp);
|
||||||
window_remove_pane(wl->window, loopwp);
|
|
||||||
}
|
|
||||||
loopwp = nextwp;
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
layout_close_pane(wp);
|
layout_close_pane(wp);
|
||||||
|
Loading…
Reference in New Issue
Block a user