Properly pick up new events when reusing a muxnote
Changes for SR-5759 introduced a bug where disarmed events got dropped when
a muxnote is reused, due to erroneously setting dmn->dmn_events to the
combination of new events and currently armed events.
Combining existing events with the combination of new events and armed events
implements the intended behavior.
diff --git a/src/event/event_epoll.c b/src/event/event_epoll.c
index 5b8fe79..db8626e 100644
--- a/src/event/event_epoll.c
+++ b/src/event/event_epoll.c
@@ -270,7 +270,7 @@
if (_dispatch_epoll_update(dmn, events, EPOLL_CTL_MOD) < 0) {
dmn = NULL;
} else {
- dmn->dmn_events = events;
+ dmn->dmn_events |= events;
dmn->dmn_disarmed_events &= ~events;
}
}
