aboutsummaryrefslogtreecommitdiff
path: root/src/event.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/event.c')
-rw-r--r--src/event.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/event.c b/src/event.c
index 45ec809..8b7d56c 100644
--- a/src/event.c
+++ b/src/event.c
@@ -81,13 +81,12 @@ static void event_dispatch_callback(event_state_t *state, layout_t *layout, even
"b:action", layout->block->actions != NULL,
"b:callback", event_fn != NULL);
- if (layout->block->actions[event.type] != NULL) {
- action_perform(layout->block->actions[event.type], layout->block, state->config);
- }
if (event_fn != NULL) {
- event_fn(layout, event);
+ event_fn(layout, state->config, event);
log_trace("Completed event callback");
+ } else if (layout->block->actions[event.type] != NULL) {
+ action_perform(layout->block->actions[event.type], layout->block, state->config);
}
}