X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fclient.c;h=8358293dcfd5f8f178be90bd10fb1acbaf2d1a40;hb=d9601bc196c130adfc14af73261919b9a7aa3db2;hp=5408b18fa9a20a64b8dc6c8c24b4dedcdd416092;hpb=d98a6183a38a8f2b88707c3b4955d10dc09e4a71;p=chaz%2Fopenbox

diff --git a/openbox/client.c b/openbox/client.c
index 5408b18f..8358293d 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -468,8 +468,7 @@ void client_manage(Window window)
         /* If a nothing at all, or a parent was focused, then focus this
            always
         */
-        if (client_search_focus_parent(self) != NULL ||
-            !focus_client)
+        if (!focus_client || client_search_focus_parent(self) != NULL)
         {
             activate = TRUE;
         }
@@ -481,8 +480,7 @@ void client_manage(Window window)
             /* Don't steal focus from globally active clients.
                I stole this idea from KWin. It seems nice.
              */
-            if (focus_client && !focus_client->can_focus &&
-                focus_client->focus_notify)
+            if (!focus_client->can_focus && focus_client->focus_notify)
             {
                 activate = FALSE;
             }