===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window-customize.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- src/usr.bin/tmux/window-customize.c	2020/06/16 08:18:34	1.4
+++ src/usr.bin/tmux/window-customize.c	2020/07/23 14:17:56	1.5
@@ -1,4 +1,4 @@
-/* $OpenBSD: window-customize.c,v 1.4 2020/06/16 08:18:34 nicm Exp $ */
+/* $OpenBSD: window-customize.c,v 1.5 2020/07/23 14:17:56 nicm Exp $ */
 
 /*
  * Copyright (c) 2020 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -403,9 +403,9 @@
 	for (i = 0; i < size; i++) {
 		if (oo2 != NULL)
 			o = options_get(oo0, list[i]);
-		else if (oo1 != NULL)
+		if (o == NULL && oo1 != NULL)
 			o = options_get(oo1, list[i]);
-		else
+		if (o == NULL)
 			o = options_get(oo2, list[i]);
 		if (options_owner(o) == oo2)
 			scope = scope2;