X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Factions.c;h=cfe0bddededc336fc0f7b4f6065a59e14de3e894;hb=fe825d1dd274ca1fdafdca333df6d6689ec039c6;hp=3bfb3b3f24011294293c5c51224ffba674851382;hpb=cfb33de8bc774c0838a7180f066eccc11b8a41cf;p=chaz%2Fopenbox

diff --git a/openbox/actions.c b/openbox/actions.c
index 3bfb3b3f..cfe0bdde 100644
--- a/openbox/actions.c
+++ b/openbox/actions.c
@@ -248,19 +248,23 @@ void actions_run_acts(GSList *acts,
 
         actions_setup_data(&data, uact, state, x, y, button, con, client);
 
-        if (!interactive_act || interactive_act->def != act->def) {
-            /* cancel the old one */
-            if (interactive_act)
-                actions_interactive_cancel_act();
-            if (actions_act_is_interactive(act))
+        /* if they have the same run function, then we'll assume they are
+           cooperating and not cancel eachother out */
+        if (!interactive_act || interactive_act->def->run != act->def->run) {
+            if (actions_act_is_interactive(act)) {
+                /* cancel the old one */
+                if (interactive_act)
+                    actions_interactive_cancel_act();
                 ok = actions_interactive_begin_act(act, state);
+            }
         }
 
         /* fire the action's run function with this data */
         if (ok) {
-            if (!act->def->run(&data, act->options))
-                actions_interactive_end_act();
-            else {
+            if (!act->def->run(&data, act->options)) {
+                if (actions_act_is_interactive(act))
+                    actions_interactive_end_act();
+            } else {
                 /* make sure its interactive if it returned TRUE */
                 g_assert(act->def->i_cancel && act->def->i_input);
 
@@ -291,6 +295,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