From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 24 Jun 2014 07:01:59 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.9~96
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a6c6e3e3a0efdcc5423a876fff22525b5da378c3;p=i3%2Fi3

Merge branch 'master' into next
---

a6c6e3e3a0efdcc5423a876fff22525b5da378c3
diff --cc src/manage.c
index 202b0649,9eee3578..61ca0409
--- a/src/manage.c
+++ b/src/manage.c
@@@ -505,7 -505,7 +505,7 @@@ void manage_window(xcb_window_t window
  
      /* 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->mapped) {
++    if (set_focus && !nc->window->doesnt_accept_focus && nc->mapped) {
          DLOG("Now setting focus.\n");
          con_focus(nc);
      }