diff options
Diffstat (limited to 'src/Fl_cocoa.mm')
| -rw-r--r-- | src/Fl_cocoa.mm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index 0df97c934..c124db7db 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -238,7 +238,7 @@ public: pthread_mutex_init(&_datalock, NULL); FD_ZERO(&_fdsets[0]); FD_ZERO(&_fdsets[1]); FD_ZERO(&_fdsets[2]); _cancelpipe[0] = _cancelpipe[1] = 0; - _maxfd = 0; + _maxfd = -1; } ~DataReady() @@ -304,12 +304,14 @@ void DataReady::AddFD(int n, int events, void (*cb)(int, void*), void *v) void DataReady::RemoveFD(int n, int events) { int i,j; + _maxfd = -1; // recalculate maxfd on the fly for (i=j=0; i<nfds; i++) { if (fds[i].fd == n) { int e = fds[i].events & ~events; if (!e) continue; // if no events left, delete this fd fds[i].events = e; } + if (fds[i].fd > _maxfd) _maxfd = fds[i].fd; // move it down in the array if necessary: if (j<i) { fds[j] = fds[i]; @@ -321,7 +323,6 @@ void DataReady::RemoveFD(int n, int events) /*LOCK*/ if (events & POLLIN) FD_CLR(n, &_fdsets[0]); /*LOCK*/ if (events & POLLOUT) FD_CLR(n, &_fdsets[1]); /*LOCK*/ if (events & POLLERR) FD_CLR(n, &_fdsets[2]); - /*LOCK*/ if (n == _maxfd) _maxfd--; DataUnlock(); } |