===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -c -r1.70 -r1.71
*** src/usr.bin/tmux/server.c	2009/11/04 22:47:34	1.70
--- src/usr.bin/tmux/server.c	2009/11/04 23:12:43	1.71
***************
*** 1,4 ****
! /* $OpenBSD: server.c,v 1.70 2009/11/04 22:47:34 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server.c,v 1.71 2009/11/04 23:12:43 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 160,170 ****
  	log_debug("socket path %s", socket_path);
  	setproctitle("server (%s)", rpathbuf);
  
  	server_fd = server_create_socket();
  	server_client_create(pair[1]);
  
- 	event_init();
- 
  	if (access(SYSTEM_CFG, R_OK) == 0) {
  		if (load_cfg(SYSTEM_CFG, NULL, &cause) != 0)
  			goto error;
--- 160,170 ----
  	log_debug("socket path %s", socket_path);
  	setproctitle("server (%s)", rpathbuf);
  
+ 	event_init();
+ 
  	server_fd = server_create_socket();
  	server_client_create(pair[1]);
  
  	if (access(SYSTEM_CFG, R_OK) == 0) {
  		if (load_cfg(SYSTEM_CFG, NULL, &cause) != 0)
  			goto error;
***************
*** 214,221 ****
  
  	while (!server_should_shutdown()) {
  		server_update_socket();
- 
- 		server_client_prepare();
  
  		event_loopexit(&tv);
  		event_loop(EVLOOP_ONCE);
--- 214,219 ----