rename dock/himeTimeout to dock/hideDelay in the config file

[chaz/openbox] / openbox / focus.c

diff --git a/openbox/focus.c b/openbox/focus.c
index 6ca589b1efe0d1391b0a3a34d1bb934c3c1eee9e..523c7b5d057cf262181a65f38bffe2f20c71475a 100644 (file)
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    focus.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
@@ -398,11 +398,14 @@ void focus_directional_cycle(ObDirection dir,
             focus_cycle_target = ft;
             frame_adjust_focus(focus_cycle_target->frame, TRUE);
         }
-        popup_cycle(ft, dialog);
+    }
+    if (focus_cycle_target) {
+        popup_cycle(focus_cycle_target, dialog);
         if (dialog)
             return;
     }
 
+
 done_cycle:
     if (done && focus_cycle_target)
         client_activate(focus_cycle_target, FALSE);