nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ensure the layout is not L_DEFAULT anymore, even if last_split_layout is not initialized (Thanks eeemsi)

This commit is contained in:
Michael Stapelberg 2012-08-04 03:43:12 +02:00
parent de94f6da1a
commit 79083f3b34
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/con.c
View File

@ -1040,7 +1040,7 @@ void con_set_layout(Con *con, int layout) {
/* 2: Set the requested layout on the split container and mark it as /* 2: Set the requested layout on the split container and mark it as
* split. */ * split. */
new->layout = layout; con_set_layout(new, layout);
new->split = true; new->split = true;
Con *old_focused = TAILQ_FIRST(&(con->focus_head)); Con *old_focused = TAILQ_FIRST(&(con->focus_head));
@ -1079,6 +1079,9 @@ void con_set_layout(Con *con, int layout) {
* default", and in v4.9 we will remove it entirely (with an * default", and in v4.9 we will remove it entirely (with an
* appropriate i3-migrate-config mechanism). */ * appropriate i3-migrate-config mechanism). */
con->layout = con->last_split_layout; con->layout = con->last_split_layout;
/* In case last_split_layout was not initialized… */
if (con->layout == L_DEFAULT)
con->layout = L_SPLITH;
} else { } else {
/* We fill in last_split_layout when switching to a different layout /* We fill in last_split_layout when switching to a different layout
* since there are many places in the code that don’t use * since there are many places in the code that don’t use