aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@openbsd.org>2012-03-20 14:06:44 +0000
committerNicholas Marriott <nicm@openbsd.org>2012-03-20 14:06:44 +0000
commit5672f2ce6bc87dc5c5215576f8f9a2b6bdadc07a (patch)
treeb01a1051bd7128879a3bd810714b8d0e624b48ac
parent01f2b5d64b18a5da6d04e4ccc66c71b4debc044a (diff)
downloadrtmux-5672f2ce6bc87dc5c5215576f8f9a2b6bdadc07a.tar.gz
rtmux-5672f2ce6bc87dc5c5215576f8f9a2b6bdadc07a.tar.bz2
rtmux-5672f2ce6bc87dc5c5215576f8f9a2b6bdadc07a.zip
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 704c7a16..34214e71 100644
--- a/window.c
+++ b/window.c
@@ -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);