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/randr.c
+++ b/src/randr.c
@ -791,7 +791,7 @@ void randr_query_outputs() {
                }

                DLOG("destroying disappearing con %p\n", output->con);
-                tree_close(output->con, DONT_KILL_WINDOW, true);
+                tree_close(output->con, DONT_KILL_WINDOW, true, false);
                DLOG("Done. Should be fine now\n");
                output->con = NULL;
            }