mirror of
				https://github.com/tmux/tmux.git
				synced 2025-10-26 12:27:15 +00:00 
			
		
		
		
	Sync OpenBSD patchset 754:
When destroying a pane, reset any mode (which reenables pane bufferevent) before freeing the bufferevent.
This commit is contained in:
		
							
								
								
									
										5
									
								
								window.c
									
									
									
									
									
								
							
							
						
						
									
										5
									
								
								window.c
									
									
									
									
									
								
							| @@ -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> |  * 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 | void | ||||||
| window_pane_destroy(struct window_pane *wp) | window_pane_destroy(struct window_pane *wp) | ||||||
| { | { | ||||||
|  | 	window_pane_reset_mode(wp); | ||||||
|  |  | ||||||
| 	if (wp->fd != -1) { | 	if (wp->fd != -1) { | ||||||
| 		close(wp->fd); | 		close(wp->fd); | ||||||
| 		bufferevent_free(wp->event); | 		bufferevent_free(wp->event); | ||||||
| @@ -500,7 +502,6 @@ window_pane_destroy(struct window_pane *wp) | |||||||
|  |  | ||||||
| 	input_free(wp); | 	input_free(wp); | ||||||
|  |  | ||||||
| 	window_pane_reset_mode(wp); |  | ||||||
| 	screen_free(&wp->base); | 	screen_free(&wp->base); | ||||||
| 	if (wp->saved_grid != NULL) | 	if (wp->saved_grid != NULL) | ||||||
| 		grid_destroy(wp->saved_grid); | 		grid_destroy(wp->saved_grid); | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Tiago Cunha
					Tiago Cunha