aboutsummaryrefslogtreecommitdiff
path: root/window.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2009-01-13 06:50:10 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2009-01-13 06:50:10 +0000
commitf85559144fbc4a58ce4f513b2217852bc959a8b6 (patch)
tree1a8442c666152328fd4fe611964520924ca42435 /window.c
parent98c85cf989a951c28e536e10de147b3263d934ce (diff)
downloadrtmux-f85559144fbc4a58ce4f513b2217852bc959a8b6.tar.gz
rtmux-f85559144fbc4a58ce4f513b2217852bc959a8b6.tar.bz2
rtmux-f85559144fbc4a58ce4f513b2217852bc959a8b6.zip
kill-pane command.
Diffstat (limited to 'window.c')
-rw-r--r--window.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/window.c b/window.c
index 511c4ab8..6d8564d4 100644
--- a/window.c
+++ b/window.c
@@ -1,4 +1,4 @@
-/* $Id: window.c,v 1.56 2009-01-12 18:22:47 nicm Exp $ */
+/* $Id: window.c,v 1.57 2009-01-13 06:50:10 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -355,18 +355,21 @@ window_add_pane(struct window *w, u_int y1,
}
if (window_pane_spawn(wp, cmd, cwd, envp) != 0) {
- if (wp == w->panes[0])
- window_remove_pane(w, 0);
- else
- window_remove_pane(w, 1);
+ window_remove_pane(w, wp);
return (-1);
}
return (0);
}
int
-window_remove_pane(struct window *w, int pane)
+window_remove_pane(struct window *w, struct window_pane *wp)
{
+ int pane;
+
+ pane = 0;
+ if (wp == w->panes[1])
+ pane = 1;
+
if (w->panes[1] != NULL) {
window_pane_destroy(w->panes[pane]);
w->panes[pane] = NULL;