diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2012-03-20 14:06:45 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2012-03-20 14:06:45 +0000 |
| commit | 703a5fa04aedcee12c93ea8bd12423dcfde67db2 (patch) | |
| tree | 69f8414545f9abb5a27946dfc28e7a2e7284f5f9 /usr.bin/tmux/window.c | |
| parent | 0097987db87ac2395f0b6750c0ec7ee403d55db9 (diff) | |
Check changes_timer with event_initialized before event_del.
Diffstat (limited to 'usr.bin/tmux/window.c')
| -rw-r--r-- | usr.bin/tmux/window.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/tmux/window.c b/usr.bin/tmux/window.c index de809b7ae14..0291ee1532b 100644 --- a/usr.bin/tmux/window.c +++ b/usr.bin/tmux/window.c @@ -1,4 +1,4 @@ -/* $OpenBSD: window.c,v 1.75 2012/03/20 11:01:00 nicm Exp $ */ +/* $OpenBSD: window.c,v 1.76 2012/03/20 14:06:44 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -649,7 +649,8 @@ window_pane_destroy(struct window_pane *wp) { window_pane_reset_mode(wp); - event_del(&wp->changes_timer); + if (event_initialized(&wp->changes_timer)) + evtimer_del(&wp->changes_timer); if (wp->fd != -1) { bufferevent_free(wp->event); |