diff options
| author | Dana Jansens <danakj@orodu.net> | 2007-07-15 13:27:33 -0400 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2007-07-15 13:27:33 -0400 |
| commit | 49b14e7bf5eb6256b69e6da66fbf7a0bca383038 (patch) | |
| tree | 8077c8eed1d74c97db2c63efc56b04c00f22d0a3 /openbox | |
| parent | 6ea96a8a9759f3219383b513c4836dbef1e7112e (diff) | |
Don't cancel interactive action when another one is run which shares the same run function. This is how actions can cooperate!
Diffstat (limited to 'openbox')
| -rw-r--r-- | openbox/actions.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/openbox/actions.c b/openbox/actions.c index 3f1c34cc..7cabbad5 100644 --- 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) |