From: Dana Jansens <danakj@orodu.net>
Date: Wed, 11 Jul 2007 22:16:39 +0000 (+0000)
Subject: only end the interactive action if it's the action you just ran
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=1d685c0dfdc12ef3910bcd91edfeee13239e2344;p=chaz%2Fopenbox

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

diff --git a/openbox/actions.c b/openbox/actions.c
index 216c6fe1..0f375267 100644
--- 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);