Don't cancel interactive action when another one is run which shares the same run...

diff --git a/openbox/actions.c b/openbox/actions.c
index 3f1c34ccc9c4e44e5c75275094566fafb3b04da1..7cabbad5ae5576982530238775d915e82e8f2527 100644 (file)
--- a/openbox/actions.c
+++ b/openbox/actions.c
@@ -248,7 +248,9 @@ 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) {
+        /* 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)