From: nicm <nicm@openbsd.org>
Date: Wed, 25 Aug 2021 10:15:15 +0000 (+0000)
Subject: Ignore client creating session when working out size if it is a control
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=a85715615b288bf46ed910df23ea4a818c413ff7;p=openbsd

Ignore client creating session when working out size if it is a control
client.
---

diff --git a/usr.bin/tmux/resize.c b/usr.bin/tmux/resize.c
index 10ce11dcf1b..d9468af56fa 100644
--- a/usr.bin/tmux/resize.c
+++ b/usr.bin/tmux/resize.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: resize.c,v 1.44 2021/06/10 07:29:45 nicm Exp $ */
+/* $OpenBSD: resize.c,v 1.45 2021/08/25 10:15:15 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -243,6 +243,13 @@ default_window_size(struct client *c, struct session *s, struct window *w,
 		}
 	}
 
+        /*
+         * Ignore the given client if it is a control client - the creating
+         * client should only affect the size if it is not a control client.
+         */
+        if (c != NULL && (c->flags & CLIENT_CONTROL))
+                c = NULL;
+
 	/*
 	 * Look for a client to base the size on. If none exists (or the type
 	 * is manual), use the default-size option.