Merge branch 'master' into next

2014-06-24 09:01:59 +02:00
parent cbd51ce664 e83b0ad64d
commit a6c6e3e3a0
2 changed files with 59 additions and 1 deletions
--- a/src/manage.c
+++ b/src/manage.c
@ -505,7 +505,7 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki

    /* Defer setting focus after the 'new' event has been sent to ensure the
     * proper window event sequence. */
-    if (set_focus && !nc->window->doesnt_accept_focus) {
+    if (set_focus && !nc->window->doesnt_accept_focus && nc->mapped) {
        DLOG("Now setting focus.\n");
        con_focus(nc);
    }