Remove-child callback skips output content cons

Every container 'above' (in the hierarchy) the workspace content should
not be closed when the last child was removed.

Add a check for output content containers and do not handle them. These
cons are at the root of the output container with dockarea siblings.
They may be run through this callback when an output is killed with
RandR.

Fixes an issue that caused content cons to become urgent when the output
is killed with RandR.

fixes: #1121
next
Tony Crisci 2013-11-22 10:00:49 -05:00 committed by Michael Stapelberg
parent cf7ea276ba
commit 57822e3ed4
1 changed files with 3 additions and 2 deletions

View File

@ -1354,8 +1354,9 @@ static void con_on_remove_child(Con *con) {
* not be closed when the last child was removed */
if (con->type == CT_OUTPUT ||
con->type == CT_ROOT ||
con->type == CT_DOCKAREA) {
DLOG("not handling, type = %d\n", con->type);
con->type == CT_DOCKAREA ||
(con->parent != NULL && con->parent->type == CT_OUTPUT)) {
DLOG("not handling, type = %d, name = %s\n", con->type, con->name);
return;
}