projects
/
dana
/
openbox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
42a58fc
)
only end the interactive action if it's the action you just ran
author
Dana Jansens
<danakj@orodu.net>
Wed, 11 Jul 2007 22:16:39 +0000
(22:16 +0000)
committer
Dana Jansens
<danakj@orodu.net>
Wed, 11 Jul 2007 22:16:39 +0000
(22:16 +0000)
openbox/actions.c
patch
|
blob
|
history
diff --git
a/openbox/actions.c
b/openbox/actions.c
index
216c6fe
..
0f37526
100644
(file)
--- 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);