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

Bugfix: fix crash when disabling floating mode

This commit is contained in:
Michael Stapelberg 2011-05-16 20:51:29 +02:00
parent 5ae4620a24
commit 03cc490f0e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/floating.c
View File

@ -179,6 +179,8 @@ void floating_disable(Con *con, bool automatic) {
return; return;
} }
Con *ws = con_get_workspace(con);
/* 1: detach from parent container */ /* 1: detach from parent container */
TAILQ_REMOVE(&(con->parent->nodes_head), con, nodes); TAILQ_REMOVE(&(con->parent->nodes_head), con, nodes);
TAILQ_REMOVE(&(con->parent->focus_head), con, focused); TAILQ_REMOVE(&(con->parent->focus_head), con, focused);
@ -190,7 +192,7 @@ void floating_disable(Con *con, bool automatic) {
/* 3: re-attach to the parent of the currently focused con on the workspace /* 3: re-attach to the parent of the currently focused con on the workspace
* this floating con was on */ * this floating con was on */
Con *focused = con_descend_tiling_focused(con_get_workspace(con)); Con *focused = con_descend_tiling_focused(ws);
/* if there is no other container on this workspace, focused will be the /* if there is no other container on this workspace, focused will be the
* workspace itself */ * workspace itself */