Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg
2011-12-20 18:44:26 +00:00
2 changed files with 28 additions and 2 deletions

View File

@ -1061,8 +1061,7 @@ static void con_on_remove_child(Con *con) {
/* For workspaces, close them only if they're not visible anymore */
if (con->type == CT_WORKSPACE) {
int children = con_num_children(con);
if (children == 0 && !workspace_is_visible(con)) {
if (TAILQ_EMPTY(&(con->focus_head)) && !workspace_is_visible(con)) {
LOG("Closing old workspace (%p / %s), it is empty\n", con, con->name);
tree_close(con, DONT_KILL_WINDOW, false, false);
ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"empty\"}");