commit | 295f67643c610351a0234d6cdce6fd3b48244eb0 | [log] [tgz] |
---|---|---|
author | Pierre Habouzit <phabouzit@apple.com> | Thu Sep 21 00:27:00 2017 -0700 |
committer | GitHub <noreply@github.com> | Thu Sep 21 00:27:00 2017 -0700 |
tree | 92d9f519d08a3067d1dc6687288968eadf8b1edc | |
parent | 947b51c0fdfd6f816198ffb86856adef9033c046 [diff] | |
parent | 13b2150c0ea4467a63026ad66ae763cae085b7db [diff] |
Merge pull request #305 from apple/jblache/SR-5759-fix Properly pick up new events when reusing a muxnote
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; } }