Merge branch 'fix-assign'

This commit is contained in:
Michael Stapelberg 2011-08-26 02:02:47 +02:00
commit 194c220508

View File

@ -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))) { if ((assignment = assignment_for(cwindow, A_TO_WORKSPACE | A_TO_OUTPUT))) {
DLOG("Assignment matches (%p)\n", match); DLOG("Assignment matches (%p)\n", match);
if (assignment->type == A_TO_WORKSPACE) { 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); DLOG("focused on ws %s: %p / %s\n", assignment->dest.workspace, nc, nc->name);
if (nc->type == CT_WORKSPACE) if (nc->type == CT_WORKSPACE)
nc = tree_open_con(nc, cwindow); nc = tree_open_con(nc, cwindow);