Merge branch 'backport' into work

[chaz/openbox] / openbox / focus_cycle.c

diff --git a/openbox/focus_cycle.c b/openbox/focus_cycle.c
index a616db64b2de0c86121c848cf86a5b489453dae4..a70151fdce236ea31ae0e6798217f93b461bdf09 100644 (file)
--- a/openbox/focus_cycle.c
+++ b/openbox/focus_cycle.c
@@ -54,9 +54,10 @@ void focus_cycle_stop(ObClient *ifclient)
 {
     /* stop focus cycling if the given client is a valid focus target,
        and so the cycling is being disrupted */
-    if (focus_cycle_target && ifclient &&
-        (ifclient == focus_cycle_target ||
-         focus_cycle_popup_is_showing(ifclient)))
+    if (focus_cycle_target &&
+        ((ifclient && (ifclient == focus_cycle_target ||
+                       focus_cycle_popup_is_showing(ifclient))) ||
+         !ifclient))
     {
         focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE,TRUE);
         focus_directional_cycle(0, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE);