?

[chaz/openbox] / openbox / screen.c

diff --git a/openbox/screen.c b/openbox/screen.c
index 053757f7dde50258620ffec400dd0a14237549a8..f37c02e97704c12766dd6e31ba2c25643fa373df 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -465,7 +465,7 @@ void screen_set_desktop(guint num)
 
     event_ignore_queued_enters();
 
-    focus_hilite = focus_fallback_target(OB_FOCUS_FALLBACK_NOFOCUS, NULL);
+    focus_hilite = focus_fallback_target(OB_FOCUS_FALLBACK_NOFOCUS);
     if (focus_hilite) {
         frame_adjust_focus(focus_hilite->frame, TRUE);
 
@@ -894,7 +894,7 @@ void screen_show_desktop(gboolean show)
         /* focus desktop */
         for (it = focus_order[screen_desktop]; it; it = g_list_next(it))
             if (((ObClient*)it->data)->type == OB_CLIENT_TYPE_DESKTOP &&
-                client_focus(it->data))
+                client_validate(it->data) && client_focus(it->data))
                 break;
     } else {
         focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS);