cancel the interactive action only if runing another one. i think this will work?

This commit is contained in:
Dana Jansens 2007-07-11 21:41:02 +00:00
parent 8eea9dcdb7
commit de1679e3e2

View file

@ -249,11 +249,12 @@ void actions_run_acts(GSList *acts,
actions_setup_data(&data, uact, state, x, y, button, con, client); actions_setup_data(&data, uact, state, x, y, button, con, client);
if (!interactive_act || interactive_act->def != act->def) { if (!interactive_act || interactive_act->def != act->def) {
/* cancel the old one */ if (actions_act_is_interactive(act)) {
if (interactive_act) /* cancel the old one */
actions_interactive_cancel_act(); if (interactive_act)
if (actions_act_is_interactive(act)) actions_interactive_cancel_act();
ok = actions_interactive_begin_act(act, state); ok = actions_interactive_begin_act(act, state);
}
} }
/* fire the action's run function with this data */ /* fire the action's run function with this data */