summaryrefslogtreecommitdiff
path: root/openbox
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2007-07-11 21:41:02 +0000
committerDana Jansens <danakj@orodu.net>2007-07-11 21:41:02 +0000
commitde1679e3e2f05a20d7ac7daaddb38db0f2e3172b (patch)
tree09b3174e080df551d3d9506233df1552e2d962dc /openbox
parent8eea9dcdb77e004e67c23061eaecce26e8cd4e68 (diff)
cancel the interactive action only if runing another one. i think this will work?
Diffstat (limited to 'openbox')
-rw-r--r--openbox/actions.c9
1 files changed, 5 insertions, 4 deletions
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 */