summaryrefslogtreecommitdiff
path: root/openbox
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2007-07-11 22:16:39 +0000
committerDana Jansens <danakj@orodu.net>2007-07-11 22:16:39 +0000
commit1d685c0dfdc12ef3910bcd91edfeee13239e2344 (patch)
tree23f42fe7403c94adabc515edf2c68f7fd34342db /openbox
parent42a58fcd2d8bcc79caa22872b712a779df354b6d (diff)
only end the interactive action if it's the action you just ran
Diffstat (limited to 'openbox')
-rw-r--r--openbox/actions.c7
1 files changed, 4 insertions, 3 deletions
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);