X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=3b4dd14537c6b641194ba73376b7355bc5066729;hb=2aa5cd3574b2bbdc103cb7626aa1ff77ea2c0046;hp=ff1386bce332da334451e96d641887c2dc9fc33f;hpb=740c5b2a20d5110435d0874f8cc6a4c9dfd14777;p=chaz%2Fopenbox

diff --git a/openbox/focus.c b/openbox/focus.c
index ff1386bc..3b4dd145 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -513,7 +513,10 @@ static gboolean valid_focus_target(ObClient *ft)
            ft->type == OB_CLIENT_TYPE_UTILITY))) &&
         ((ft->can_focus || ft->focus_notify) &&
          !ft->skip_taskbar &&
-         (ft->desktop == screen_desktop || ft->desktop == DESKTOP_ALL)))
+         (ft->desktop == screen_desktop || ft->desktop == DESKTOP_ALL)) &&
+        ft == client_focus_target(ft))
+        return TRUE;
+/*
     {
         GSList *it;
 
@@ -525,6 +528,7 @@ static gboolean valid_focus_target(ObClient *ft)
         }
         return TRUE;
     }
+*/
 
     return FALSE;
 }
@@ -662,11 +666,12 @@ void focus_order_add_new(ObClient *c)
                 else
                     focus_order[i] = g_list_insert(focus_order[i], c, 1);
             }
-        } else
-             if (focus_order[d] && ((ObClient*)focus_order[d]->data)->iconic)
+        } else {
+            if (focus_order[d] && ((ObClient*)focus_order[d]->data)->iconic)
                 focus_order[d] = g_list_insert(focus_order[d], c, 0);
             else
                 focus_order[d] = g_list_insert(focus_order[d], c, 1);
+        }
     }
 }