===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/resize.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- src/usr.bin/tmux/resize.c	2019/11/28 09:45:16	1.35
+++ src/usr.bin/tmux/resize.c	2019/11/29 16:04:07	1.36
@@ -1,4 +1,4 @@
-/* $OpenBSD: resize.c,v 1.35 2019/11/28 09:45:16 nicm Exp $ */
+/* $OpenBSD: resize.c,v 1.36 2019/11/29 16:04:07 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -80,7 +80,7 @@
     u_int *sx, u_int *sy, u_int *xpixel, u_int *ypixel, int type)
 {
 	struct client	*loop;
-	u_int		 cx, cy;
+	u_int		 cx, cy, n;
 	const char	*value;
 
 	if (type == -1)
@@ -149,12 +149,22 @@
 			*xpixel = c->tty.xpixel;
 		        *ypixel = c->tty.ypixel;
 		} else {
+			if (w == NULL)
+				goto manual;
+			n = 0;
+			TAILQ_FOREACH(loop, &clients, entry) {
+				if (!ignore_client_size(loop) &&
+				    session_has(loop->session, w)) {
+					if (++n > 1)
+						break;
+				}
+			}
 			*sx = *sy = UINT_MAX;
 			*xpixel = *ypixel = 0;
 			TAILQ_FOREACH(loop, &clients, entry) {
 				if (ignore_client_size(loop))
 					continue;
-				if (w != NULL && loop != w->latest)
+				if (n > 1 && loop != w->latest)
 					continue;
 				s = loop->session;
 
@@ -204,7 +214,7 @@
 {
 	struct session	*s;
 	struct client	*c;
-	u_int		 sx, sy, cx, cy, xpixel = 0, ypixel = 0;
+	u_int		 sx, sy, cx, cy, xpixel = 0, ypixel = 0, n;
 	int		 type, current, has, changed;
 
 	if (w->active == NULL)
@@ -277,11 +287,19 @@
 			changed = 0;
 		break;
 	case WINDOW_SIZE_LATEST:
+		n = 0;
+		TAILQ_FOREACH(c, &clients, entry) {
+			if (!ignore_client_size(c) &&
+			    session_has(c->session, w)) {
+				if (++n > 1)
+					break;
+			}
+		}
 		sx = sy = UINT_MAX;
 		TAILQ_FOREACH(c, &clients, entry) {
 			if (ignore_client_size(c))
 				continue;
-			if (c != w->latest)
+			if (n > 1 && c != w->latest)
 				continue;
 			s = c->session;