only end the interactive action if it's the action you just ran

[chaz/openbox] / openbox / actions.c

diff --git a/openbox/actions.c b/openbox/actions.c
index 216c6fe14581922bac136cd86d4dc11effba419e..0f37526773efd88199e24a29a236f2545889199f 100644 (file)
--- a/openbox/actions.c
+++ b/openbox/actions.c
@@ -259,9 +259,10 @@ void actions_run_acts(GSList *acts,
 
         /* 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);