circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 13:37:12 +00:00
Code Issues Projects Releases Wiki Activity

This is a better fix for OS X stupidity.

Browse Source
This commit is contained in:
Nicholas Marriott
2009-08-19 09:00:06 +00:00
parent 3f7e2589cd
commit 620402a833
8 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server.c
View File

@ -1,4 +1,4 @@
/* $Id: server.c,v 1.170 2009-08-16 19:33:49 tcunha Exp $ */
/* $OpenBSD: server.c,v 1.23 2009/08/18 21:37:04 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -319,10 +319,8 @@ server_main(int srv_fd)
pfd = pfds;
/* Handle server socket. */
#ifdef HAVE_POLL
if (pfd->revents & (POLLERR|POLLNVAL|POLLHUP))
fatalx("lost server socket");
#endif
if (pfd->revents & POLLIN) {
server_accept_client(srv_fd);
continue;
@ -1111,13 +1109,12 @@ 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, flag;
flag = options_get_number(&w->options, "remain-on-exit");
int destroyed;
destroyed = 1;
@ -1130,7 +1127,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 && !flag) {
if (wp->fd == -1 && !options_get_number(oo, "remain-on-exit")) {
layout_close_pane(wp);
window_remove_pane(w, wp);
server_redraw_window(w);