When a window is the focus target and it is removed from the focus order, reset the...

[chaz/openbox] / openbox / focus_cycle.c

diff --git a/openbox/focus_cycle.c b/openbox/focus_cycle.c
index 39d704cc3e5af02e454234ef749819c81c1e6b27..93a9a9930ee1884743372b1ac2ff314f8500fb1e 100644 (file)
--- a/openbox/focus_cycle.c
+++ b/openbox/focus_cycle.c
@@ -74,7 +74,7 @@ void focus_cycle_addremove(ObClient *c, gboolean redraw)
         gboolean v, s;
 
         v = focus_cycle_valid(c);
-        s = focus_cycle_popup_is_showing(c);
+        s = focus_cycle_popup_is_showing(c) || c == focus_cycle_target;
 
         if (v != s)
             focus_cycle_reorder();
@@ -93,7 +93,8 @@ void focus_cycle_reorder()
         focus_cycle_update_indicator(focus_cycle_target);
         if (!focus_cycle_target)
             focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE,
-                        TRUE, TRUE, TRUE, TRUE, TRUE);
+                        TRUE, TRUE, OB_FOCUS_CYCLE_POPUP_MODE_NONE,
+                        TRUE, TRUE);
     }
 }