===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-client.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -c -r1.127 -r1.128
*** src/usr.bin/tmux/server-client.c	2015/02/01 23:43:23	1.127
--- src/usr.bin/tmux/server-client.c	2015/02/06 17:17:12	1.128
***************
*** 1,4 ****
! /* $OpenBSD: server-client.c,v 1.127 2015/02/01 23:43:23 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server-client.c,v 1.128 2015/02/06 17:17:12 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 773,791 ****
  void
  server_client_set_title(struct client *c)
  {
! 	struct session	*s = c->session;
! 	const char	*template;
! 	char		*title;
  
  	template = options_get_string(&s->options, "set-titles-string");
  
! 	title = status_replace(c, NULL, template, time(NULL), 1);
  	if (c->title == NULL || strcmp(title, c->title) != 0) {
  		free(c->title);
  		c->title = xstrdup(title);
  		tty_set_title(&c->tty, c->title);
  	}
  	free(title);
  }
  
  /* Dispatch message from client. */
--- 773,797 ----
  void
  server_client_set_title(struct client *c)
  {
! 	struct session		*s = c->session;
! 	const char		*template;
! 	char			*title;
! 	struct format_tree	*ft;
  
  	template = options_get_string(&s->options, "set-titles-string");
  
! 	ft = format_create();
! 	format_defaults(ft, c, NULL, NULL, NULL);
! 
! 	title = format_expand_time(ft, template, time(NULL));
  	if (c->title == NULL || strcmp(title, c->title) != 0) {
  		free(c->title);
  		c->title = xstrdup(title);
  		tty_set_title(&c->tty, c->title);
  	}
  	free(title);
+ 
+ 	format_free(ft);
  }
  
  /* Dispatch message from client. */