aboutsummaryrefslogtreecommitdiff
path: root/cmd-kill-pane.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2009-01-14 19:29:32 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2009-01-14 19:29:32 +0000
commitb4ac8c1342184d6a81985704c154f3a3e744fffd (patch)
tree8123c107b14d67631bfda6ca0dd94e261f3b1dc0 /cmd-kill-pane.c
parente02496f073886eed4b1f83db0c4eb65cce4c54ec (diff)
downloadrtmux-b4ac8c1342184d6a81985704c154f3a3e744fffd.tar.gz
rtmux-b4ac8c1342184d6a81985704c154f3a3e744fffd.tar.bz2
rtmux-b4ac8c1342184d6a81985704c154f3a3e744fffd.zip
Multiple window splitting.
Diffstat (limited to 'cmd-kill-pane.c')
-rw-r--r--cmd-kill-pane.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/cmd-kill-pane.c b/cmd-kill-pane.c
index ccfcfe39..81040cc1 100644
--- a/cmd-kill-pane.c
+++ b/cmd-kill-pane.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-kill-pane.c,v 1.1 2009-01-13 06:50:10 nicm Exp $ */
+/* $Id: cmd-kill-pane.c,v 1.2 2009-01-14 19:29:32 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -53,17 +53,18 @@ cmd_kill_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
if (data->pane == -1)
wp = wl->window->active;
else {
- if (data->pane > 1 || wl->window->panes[data->pane] == NULL) {
+ wp = window_pane_at_index(wl->window, data->pane);
+ if (wp == NULL) {
ctx->error(ctx, "no pane: %d", data->pane);
return;
}
- wp = wl->window->panes[data->pane];
}
- if (window_remove_pane(wl->window, wp) != 0) {
+ if (window_count_panes(wl->window) == 1) {
ctx->error(ctx, "can't kill pane: %d", data->pane);
return;
}
+ window_remove_pane(wl->window, wp);
server_redraw_window(wl->window);
if (ctx->cmdclient != NULL)