From d3c842d3678e52275c944123f00a2a974eb5d965 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Sat, 17 Mar 2012 18:24:07 +0000 Subject: Check event_initialized before event_del if event may not have been set up; libevent2 complains about this. Reported by Moriyoshi Koizumi. --- tty-keys.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tty-keys.c') diff --git a/tty-keys.c b/tty-keys.c index 91bf6503..37265dce 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); -- cgit