One less crash for nosafefocus.

diff --git a/openbox/focus_cycle.c b/openbox/focus_cycle.c
index 14c6537478b7d218ff0fdb23f8af9d1cf254c6c3..b0a6505d4f214401b362d8f19f10177c9c61913b 100644 (file)
--- a/openbox/focus_cycle.c
+++ b/openbox/focus_cycle.c
@@ -285,9 +285,10 @@ ObClient* focus_directional_cycle(ObDirection dir, gboolean dock_windows,
         focus_cycle_desktop_windows = desktop_windows;
     }
 
-    if (!first) first = focus_client;
+    if (!g_list_find(client_list, first))
+        first = focus_client;
 
-    if (focus_cycle_target)
+    if (g_list_find(client_list, focus_cycle_target))
         ft = focus_find_directional(focus_cycle_target, dir, dock_windows,
                                     desktop_windows);
     else if (first)