dont queue up interative end actions

[chaz/openbox] / openbox / screen.c

diff --git a/openbox/screen.c b/openbox/screen.c
index 8a9475adf57d87592bcf029076d788f090688c29..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)
@@ -572,7 +578,7 @@ void screen_desktop_popup(guint d, gboolean show)
 {
     Rect *a;
 
-    if (!show || !config_dialog_desktop) {
+    if (!show) {
         pager_popup_hide(desktop_cycle_popup);
     } else {
         a = screen_physical_area_monitor(0);
@@ -860,10 +866,10 @@ void screen_install_colormap(ObClient *client, gboolean install)
     XWindowAttributes wa;
 
     if (client == NULL) {
-       if (install)
-           XInstallColormap(RrDisplay(ob_rr_inst), RrColormap(ob_rr_inst));
-       else
-           XUninstallColormap(RrDisplay(ob_rr_inst), RrColormap(ob_rr_inst));
+        if (install)
+            XInstallColormap(RrDisplay(ob_rr_inst), RrColormap(ob_rr_inst));
+        else
+            XUninstallColormap(RrDisplay(ob_rr_inst), RrColormap(ob_rr_inst));
     } else {
         if (XGetWindowAttributes(ob_display, client->window, &wa) &&
             wa.colormap != None) {