dont queue up interative end actions

[chaz/openbox] / openbox / screen.c

diff --git a/openbox/screen.c b/openbox/screen.c
index a8f3b71cc8ee3647bb8eedd2414394c68857b04b..9c4620b293e7cbea6478e2c53c4a5a26e2cd7577 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -457,7 +457,13 @@ void screen_set_desktop(guint num)
 
     event_ignore_queued_enters();
 
-    focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS);
+    /*!
+      When this focus_client check is not used, you can end up with races, as
+      demonstrated with gnome-panel, sometmies the window you click on on
+      another desktop ends up losing focus cuz of the fallback.
+    */
+    if (!focus_client)
+        focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS);
 }
 
 static void get_row_col(guint d, guint *r, guint *c)