===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/session.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- src/usr.bin/tmux/session.c	2011/01/13 02:08:14	1.29
+++ src/usr.bin/tmux/session.c	2011/01/25 22:31:50	1.30
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.29 2011/01/13 02:08:14 nicm Exp $ */
+/* $OpenBSD: session.c,v 1.30 2011/01/25 22:31:50 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -212,10 +212,16 @@
     const char *name, const char *cmd, const char *cwd, int idx, char **cause)
 {
 	struct window	*w;
+	struct winlink	*wl;
 	struct environ	 env;
 	const char	*shell;
 	u_int		 hlimit;
 
+	if ((wl = winlink_add(&s->windows, idx)) == NULL) {
+		xasprintf(cause, "index in use: %d", idx);
+		return (NULL);
+	}
+
 	environ_init(&env);
 	environ_copy(&global_environ, &env);
 	environ_copy(&s->environ, &env);
@@ -229,15 +235,18 @@
 	w = window_create(
 	    name, cmd, shell, cwd, &env, s->tio, s->sx, s->sy, hlimit, cause);
 	if (w == NULL) {
+		winlink_remove(&s->windows, wl);
 		environ_free(&env);
 		return (NULL);
 	}
+	winlink_set_window(wl, w);
 	environ_free(&env);
 
 	if (options_get_number(&s->options, "set-remain-on-exit"))
 		options_set_number(&w->options, "remain-on-exit", 1);
 
-	return (session_attach(s, w, idx, cause));
+	session_group_synchronize_from(s);
+	return (wl);
 }
 
 /* Attach a window to a session. */
@@ -246,8 +255,12 @@
 {
 	struct winlink	*wl;
 
-	if ((wl = winlink_add(&s->windows, w, idx)) == NULL)
+	if ((wl = winlink_add(&s->windows, idx)) == NULL) {
 		xasprintf(cause, "index in use: %d", idx);
+		return (NULL);
+	}
+	winlink_set_window(wl, w);
+
 	session_group_synchronize_from(s);
 	return (wl);
 }
@@ -526,7 +539,8 @@
 
 	/* Link all the windows from the target. */
 	RB_FOREACH(wl, winlinks, ww) {
-		wl2 = winlink_add(&s->windows, wl->window, wl->idx);
+		wl2 = winlink_add(&s->windows, wl->idx);
+		winlink_set_window(wl2, wl->window);
 		wl2->flags |= wl->flags & WINLINK_ALERTFLAGS;
 	}