From: Dana Jansens <danakj@orodu.net>
Date: Wed, 11 Jul 2007 21:41:02 +0000 (+0000)
Subject: cancel the interactive action only if runing another one. i think this will work?
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=de1679e3e2f05a20d7ac7daaddb38db0f2e3172b;p=chaz%2Fopenbox

cancel the interactive action only if runing another one. i think this will work?
---

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 */