circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

pull/2359/head
Thomas Adam 2020-07-23 16:01:17 +01:00
parent e0d984597b 112b0f417c
commit 1f19355fb0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
window-customize.c
View File

@ -403,9 +403,9 @@ window_customize_build_options(struct window_customize_modedata *data,
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;