Merge branch 'master' into next

2011-08-24 23:00:12 +02:00
parent 37a40671c9 53cec79181
commit 75c11cb894
4 changed files with 26 additions and 8 deletions
--- a/src/floating.c
+++ b/src/floating.c
@ -286,7 +286,7 @@ bool floating_maybe_reassign_ws(Con *con) {
    Con *content = output_get_content(output->con);
    Con *ws = TAILQ_FIRST(&(content->focus_head));
    DLOG("Moving con %p / %s to workspace %p / %s\n", con, con->name, ws, ws->name);
-    con_move_to_workspace(con, ws);
+    con_move_to_workspace(con, ws, true);
    con_focus(con_descend_focused(con));
    return true;
 }