Sync OpenBSD patchset 1057:

Check event_initialized before event_del if event may not have been set
up; libevent2 complains about this. Reported by Moriyoshi Koizumi.

1 files changed, 4 insertions, 2 deletions

diff --git a/tty-keys.c b/tty-keys.c
index fb88d9e0..fcf3a529 100644
--- a/tty-keys.c
+++ b/tty-keys.c
@@ -549,7 +549,8 @@ start_timer:
 	tv.tv_sec = delay / 1000;
 	tv.tv_usec = (delay % 1000) * 1000L;
 
-	evtimer_del(&tty->key_timer);
+	if (event_initialized(&tty->key_timer))
+		evtimer_del(&tty->key_timer);
 	evtimer_set(&tty->key_timer, tty_keys_callback, tty);
 	evtimer_add(&tty->key_timer, &tv);
 
@@ -573,7 +574,8 @@ found_key:
 	goto handle_key;
 
 handle_key:
-	evtimer_del(&tty->key_timer);
+	if (event_initialized(&tty->key_timer))
+		evtimer_del(&tty->key_timer);
 
 	if (key != KEYC_NONE)
 		tty->key_callback(key, &mouse, tty->key_data);