diff options
author | Tiago Cunha <tcunha@gmx.com> | 2010-08-29 14:46:13 +0000 |
---|---|---|
committer | Tiago Cunha <tcunha@gmx.com> | 2010-08-29 14:46:13 +0000 |
commit | 01052ca38e1470601533d9199ff80799321bbadb (patch) | |
tree | 709626c16f1429619aedaada8c36845a6e4f6b5f | |
parent | ee44a8dca967ea1b3a85d21ff94b3a87c5f30afe (diff) | |
download | rtmux-01052ca38e1470601533d9199ff80799321bbadb.tar.gz rtmux-01052ca38e1470601533d9199ff80799321bbadb.tar.bz2 rtmux-01052ca38e1470601533d9199ff80799321bbadb.zip |
Sync OpenBSD patchset 754:
When destroying a pane, reset any mode (which reenables pane
bufferevent) before freeing the bufferevent.
-rw-r--r-- | window.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $Id: window.c,v 1.135 2010-08-29 14:42:11 tcunha Exp $ */ +/* $Id: window.c,v 1.136 2010-08-29 14:46:13 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -493,6 +493,8 @@ window_pane_create(struct window *w, u_int sx, u_int sy, u_int hlimit) void window_pane_destroy(struct window_pane *wp) { + window_pane_reset_mode(wp); + if (wp->fd != -1) { close(wp->fd); bufferevent_free(wp->event); @@ -500,7 +502,6 @@ window_pane_destroy(struct window_pane *wp) input_free(wp); - window_pane_reset_mode(wp); screen_free(&wp->base); if (wp->saved_grid != NULL) grid_destroy(wp->saved_grid); |