aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2012-03-29 21:06:25 +0000
committerTiago Cunha <tcunha@gmx.com>2012-03-29 21:06:25 +0000
commit37e5b5d94746c6766ba45bb5d7fef48322d8db63 (patch)
treec3dafa39411374d77493afc5b33a57880f1767db
parent8ff20a5c6dd3190990bb391405d65e7e6fa135af (diff)
downloadrtmux-37e5b5d94746c6766ba45bb5d7fef48322d8db63.tar.gz
rtmux-37e5b5d94746c6766ba45bb5d7fef48322d8db63.tar.bz2
rtmux-37e5b5d94746c6766ba45bb5d7fef48322d8db63.zip
Sync OpenBSD patchset 1074:
Check changes_timer with event_initialized before event_del.
-rw-r--r--window.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/window.c b/window.c
index 73e08f6f..5e2cfa6f 100644
--- a/window.c
+++ b/window.c
@@ -646,7 +646,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);