X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Factions.c;h=216c6fe14581922bac136cd86d4dc11effba419e;hb=de1679e3e2f05a20d7ac7daaddb38db0f2e3172b;hp=3bfb3b3f24011294293c5c51224ffba674851382;hpb=8eea9dcdb77e004e67c23061eaecce26e8cd4e68;p=chaz%2Fopenbox

diff --git a/openbox/actions.c b/openbox/actions.c
index 3bfb3b3f..216c6fe1 100644
--- a/openbox/actions.c
+++ b/openbox/actions.c
@@ -249,11 +249,12 @@ 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 (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 */