===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- src/usr.bin/tmux/tmux.c	2009/07/20 14:37:51	1.19
+++ src/usr.bin/tmux/tmux.c	2009/07/22 21:58:56	1.20
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.c,v 1.19 2009/07/20 14:37:51 nicm Exp $ */
+/* $OpenBSD: tmux.c,v 1.20 2009/07/22 21:58:56 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -213,7 +213,7 @@
 	struct passwd		*pw;
 	char			*s, *path, *label, *cause, *home, *pass = NULL;
 	char			 cwd[MAXPATHLEN];
-	int	 		 retcode, opt, flags, unlock, start_server;
+	int	 		 retcode, opt, flags, unlock, cmdflags = 0;
 
 	unlock = flags = 0;
 	label = path = NULL;
@@ -390,7 +390,7 @@
 		cmdlist = NULL;
 		if ((pass = getpass("Password: ")) == NULL)
 			exit(1);
-		start_server = 0;
+		cmdflags &= ~CMD_STARTSERVER;
 	} else {
 		if (argc == 0) {
 			cmd = xmalloc(sizeof *cmd);
@@ -407,17 +407,16 @@
 				exit(1);
 			}
 		}
-		start_server = 0;
 		TAILQ_FOREACH(cmd, cmdlist, qentry) {
 			if (cmd->entry->flags & CMD_STARTSERVER) {
-				start_server = 1;
+				cmdflags |= CMD_STARTSERVER;
 				break;
 			}
 		}
 	}
 
  	memset(&cctx, 0, sizeof cctx);
-	if (client_init(path, &cctx, start_server, flags) != 0)
+	if (client_init(path, &cctx, cmdflags, flags) != 0)
 		exit(1);
 	xfree(path);