indenting, focus fallback to None not PointerRoot

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index 4abb86be6d3f1dc928788f34b76f2afb1dce9e75..918024969f4cda9387894703c7b82e2594fef37c 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1179,7 +1179,6 @@ ObMenuFrame* find_active_menu()
 
 ObMenuFrame* find_active_or_last_menu()
 {
-    GList *it;
     ObMenuFrame *ret = NULL;
 
     ret = find_active_menu();
@@ -1260,9 +1259,11 @@ static gboolean focus_delay_func(gpointer data)
 {
     ObClient *c = data;
 
-    client_focus(c);
-    if (config_focus_raise)
-        client_raise(c);
+    if (focus_client != c) {
+        client_focus(c);
+        if (config_focus_raise)
+            client_raise(c);
+    }
     return FALSE; /* no repeat */
 }