mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 09:44:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Call event_init() before loading the config file, since potentially it could

Browse Source 
set up events.
This commit is contained in:
Nicholas Marriott
2009-11-04 22:40:36 +00:00
parent 91ad830c88
commit 06ffed3216
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server.c
View File

@@ -163,6 +163,8 @@ server_start(char *path)
server_fd = server_create_socket(); server_fd = server_create_socket();
server_client_create(pair[1]); server_client_create(pair[1]);
event_init();
if (access(SYSTEM_CFG, R_OK) == 0) { if (access(SYSTEM_CFG, R_OK) == 0) {
if (load_cfg(SYSTEM_CFG, NULL, &cause) != 0) if (load_cfg(SYSTEM_CFG, NULL, &cause) != 0)
goto error; goto error;
@@ -173,8 +175,6 @@ server_start(char *path)
if (cfg_file != NULL && load_cfg(cfg_file, NULL, &cause) != 0) if (cfg_file != NULL && load_cfg(cfg_file, NULL, &cause) != 0)
goto error; goto error;
event_init();
event_set(&server_ev_accept, event_set(&server_ev_accept,
server_fd, EV_READ|EV_PERSIST, server_accept_callback, NULL); server_fd, EV_READ|EV_PERSIST, server_accept_callback, NULL);
event_add(&server_ev_accept, NULL); event_add(&server_ev_accept, NULL);