From 13b2150c0ea4467a63026ad66ae763cae085b7db Mon Sep 17 00:00:00 2001 From: Julien Blache Date: Wed, 20 Sep 2017 18:54:17 -0700 Subject: [PATCH] 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. --- src/event/event_epoll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/event/event_epoll.c b/src/event/event_epoll.c index 5b8fe79b5..db8626e3d 100644 --- a/src/event/event_epoll.c +++ b/src/event/event_epoll.c @@ -270,7 +270,7 @@ _dispatch_unote_register(dispatch_unote_t du, 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; } }