Merge branch 'master' into next

diff --git a/src/manage.c b/src/manage.c
index af3412413657df7223106aa31ed8842b02b1a308..9ee3dd72a8add59d806dc5a8ede7e3819d40da41 100644 (file)
--- a/src/manage.c
+++ b/src/manage.c
@@ -223,7 +223,7 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki
         if ((assignment = assignment_for(cwindow, A_TO_WORKSPACE | A_TO_OUTPUT))) {
             DLOG("Assignment matches (%p)\n", match);
             if (assignment->type == A_TO_WORKSPACE) {
-                nc = con_descend_focused(workspace_get(assignment->dest.workspace, NULL));
+                nc = con_descend_tiling_focused(workspace_get(assignment->dest.workspace, NULL));
                 DLOG("focused on ws %s: %p / %s\n", assignment->dest.workspace, nc, nc->name);
                 if (nc->type == CT_WORKSPACE)
                     nc = tree_open_con(nc, cwindow);