Skip to content

Commit 59dc8e3

Browse files
fix: merge explicitly provided callback in process_events
1 parent 854ef13 commit 59dc8e3

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/systems/callbacks.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,5 +510,6 @@ function process_events(sys; callback = nothing, kwargs...)
510510
discrete_cb = nothing
511511
end
512512

513-
(discrete_cb === nothing) ? contin_cb : CallbackSet(contin_cb, discrete_cb...)
513+
cb = merge_cb(contin_cb, callback)
514+
(discrete_cb === nothing) ? cb : CallbackSet(contin_cb, discrete_cb...)
514515
end

0 commit comments

Comments
 (0)