circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-04 15:26:58 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 1057:

Browse Source 
Check event_initialized before event_del if event may not have been set
up; libevent2 complains about this. Reported by Moriyoshi Koizumi.
This commit is contained in:
Tiago Cunha
2012-03-18 01:59:34 +00:00
parent 5aa28473dd
commit 0987d55231
7 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tty-keys.c
View File

@ -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);