===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window.c,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -r1.269 -r1.270
--- src/usr.bin/tmux/window.c	2021/02/22 07:09:06	1.269
+++ src/usr.bin/tmux/window.c	2021/03/11 06:31:05	1.270
@@ -1,4 +1,4 @@
-/* $OpenBSD: window.c,v 1.269 2021/02/22 07:09:06 nicm Exp $ */
+/* $OpenBSD: window.c,v 1.270 2021/03/11 06:31:05 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -622,18 +622,18 @@
 		wp->layout_cell = wp->saved_layout_cell;
 		wp->saved_layout_cell = NULL;
 	}
-	layout_fix_panes(w);
+	layout_fix_panes(w, NULL);
 	notify_window("window-layout-changed", w);
 
 	return (0);
 }
 
 int
-window_push_zoom(struct window *w, int flag)
+window_push_zoom(struct window *w, int always, int flag)
 {
 	log_debug("%s: @%u %d", __func__, w->id,
 	    flag && (w->flags & WINDOW_ZOOMED));
-	if (flag && (w->flags & WINDOW_ZOOMED))
+	if (flag && (always || (w->flags & WINDOW_ZOOMED)))
 		w->flags |= WINDOW_WASZOOMED;
 	else
 		w->flags &= ~WINDOW_WASZOOMED;