Merge branch 'master' into next

2013-01-01 16:31:27 +01:00
parent 6856b232d6 c394efbfd0
commit 2c249b6949
2 changed files with 68 additions and 0 deletions
--- a/src/manage.c
+++ b/src/manage.c
@ -406,6 +406,10 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki
    /* Check if any assignments match */
    run_assignments(cwindow);

+    /* 'ws' may be invalid because of the assignments, e.g. when the user uses
+     * "move window to workspace 1", but had it assigned to workspace 2. */
+    ws = con_get_workspace(nc);
+
    /* If this window was put onto an invisible workspace (via assignments), we
     * render this workspace. It wouldn’t be rendered in our normal code path
     * because only the visible workspaces get rendered.