Merge branch 'master' into next

2011-09-22 20:11:44 +01:00
parent 143663f031 ef0f4e7299
commit 1717b88174
8 changed files with 28 additions and 14 deletions
--- a/src/workspace.c
+++ b/src/workspace.c
@ -211,7 +211,7 @@ void workspace_show(const char *num) {
        /* check if this workspace is currently visible */
        if (!workspace_is_visible(old)) {
            LOG("Closing old workspace (%p / %s), it is empty\n", old, old->name);
-            tree_close(old, DONT_KILL_WINDOW, false);
+            tree_close(old, DONT_KILL_WINDOW, false, false);
            ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"empty\"}");
            changed_num_workspaces = true;
        }