X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=6d66382a5dc5d2d8f7a09c3af2d2b013cb396e0a;hb=881a8647d2eb5f13eccda87a712c180fa9e902cf;hp=303388bec210d146accfe5cdf10585f96bc83ebb;hpb=8772b46b56172e35506f21d626aa89bd649615c6;p=chaz%2Fopenbox

diff --git a/openbox/focus.c b/openbox/focus.c
index 303388be..6d66382a 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -126,7 +126,7 @@ static ObClient* focus_fallback_target(gboolean allow_refocus,
            backup fallback though)
         */
         if ((allow_omnipresent || c->desktop == screen_desktop) &&
-            client_normal(c) &&
+            focus_cycle_target_valid(c, FALSE, FALSE, FALSE, FALSE) &&
             (allow_refocus || client_focus_target(c) != old) &&
             client_focus(c))
         {
@@ -145,7 +145,7 @@ static ObClient* focus_fallback_target(gboolean allow_refocus,
            a splashscreen or a desktop window (save the desktop as a
            backup fallback though)
         */
-        if (c->type == OB_CLIENT_TYPE_DESKTOP &&
+        if (focus_cycle_target_valid(c, FALSE, FALSE, FALSE, TRUE) &&
             (allow_refocus || client_focus_target(c) != old) &&
             client_focus(c))
         {