aboutsummaryrefslogtreecommitdiff
path: root/server.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2009-08-19 09:04:48 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2009-08-19 09:04:48 +0000
commit11f0f812c5526126706dd1f11ed072faf0c4a9b2 (patch)
treef88fc7cf41c3e625b4611152a68709cbfb5b7a97 /server.c
parent620402a833a4e42590a26390d2b7a39fd39e3ea9 (diff)
downloadrtmux-11f0f812c5526126706dd1f11ed072faf0c4a9b2.tar.gz
rtmux-11f0f812c5526126706dd1f11ed072faf0c4a9b2.tar.bz2
rtmux-11f0f812c5526126706dd1f11ed072faf0c4a9b2.zip
Didn't mean to commit this stuff.
Diffstat (limited to 'server.c')
-rw-r--r--server.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/server.c b/server.c
index 7eb43875..2354b1fc 100644
--- a/server.c
+++ b/server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server.c,v 1.23 2009/08/18 21:37:04 nicm Exp $ */
+/* $Id: server.c,v 1.172 2009-08-19 09:04:48 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1109,12 +1109,13 @@ void
server_check_window(struct window *w)
{
struct window_pane *wp, *wq;
- struct options *oo = &w->options;
struct client *c;
struct session *s;
struct winlink *wl;
u_int i, j;
- int destroyed;
+ int destroyed, flag;
+
+ flag = options_get_number(&w->options, "remain-on-exit");
destroyed = 1;
@@ -1127,7 +1128,7 @@ server_check_window(struct window *w)
* the window to be destroyed (or it'll close when the last
* pane dies).
*/
- if (wp->fd == -1 && !options_get_number(oo, "remain-on-exit")) {
+ if (wp->fd == -1 && !flag) {
layout_close_pane(wp);
window_remove_pane(w, wp);
server_redraw_window(w);