move directionalcycling actions into the same .c file. make interactive actions all...

[chaz/openbox] / openbox / actions.c

diff --git a/openbox/actions.c b/openbox/actions.c
index 0f37526773efd88199e24a29a236f2545889199f..3f1c34ccc9c4e44e5c75275094566fafb3b04da1 100644 (file)
--- a/openbox/actions.c
+++ b/openbox/actions.c
@@ -293,6 +293,11 @@ static gboolean actions_interactive_begin_act(ObActionsAct *act, guint state)
         actions_act_ref(interactive_act);
 
         interactive_initial_state = state;
+
+        /* if using focus_delay, stop the timer now so that focus doesn't go
+           moving on us, which would kill the action */
+        event_halt_focus_delay();
+    
         return TRUE;
     }
     else