diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-03-17 20:39:28 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-03-17 20:39:28 +0100 |
| commit | 7fd5d934c1e73642e9919aa8dd5124466356fb89 (patch) | |
| tree | 1942909531fe17bb60bd1e4601d7455b19b5c177 /nx-X11/programs/Xserver/os/io.c | |
| parent | 6ac805ab4411d3045c99e3ceefe8495ac95d8e15 (diff) | |
| parent | f315ae066598d0dc955db081f8d0faf8d358292d (diff) | |
| download | nx-libs-7fd5d934c1e73642e9919aa8dd5124466356fb89.tar.gz nx-libs-7fd5d934c1e73642e9919aa8dd5124466356fb89.tar.bz2 nx-libs-7fd5d934c1e73642e9919aa8dd5124466356fb89.zip | |
Merge branch 'sunweaver-pr/setnotifyfd-ABI' into 3.6.x
Attributes GH PR #331: https://github.com/ArcticaProject/nx-libs/pull/331
Diffstat (limited to 'nx-X11/programs/Xserver/os/io.c')
| -rw-r--r-- | nx-X11/programs/Xserver/os/io.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/os/io.c b/nx-X11/programs/Xserver/os/io.c index 87739cfb1..92a3f0476 100644 --- a/nx-X11/programs/Xserver/os/io.c +++ b/nx-X11/programs/Xserver/os/io.c @@ -1062,7 +1062,7 @@ FlushClient(ClientPtr who, OsCommPtr oc, const void *__extraBuf, int extraCount) and not ready to accept more. Make a note of it and buffer the rest. */ FD_SET(connection, &ClientsWriteBlocked); - AnyClientsWriteBlocked = TRUE; + AnyWritesPending = TRUE; if (written < oco->count) { @@ -1134,11 +1134,12 @@ FlushClient(ClientPtr who, OsCommPtr oc, const void *__extraBuf, int extraCount) /* everything was flushed out */ oco->count = 0; /* check to see if this client was write blocked */ - if (AnyClientsWriteBlocked) + if (AnyWritesPending) { FD_CLR(oc->fd, &ClientsWriteBlocked); - if (! XFD_ANYSET(&ClientsWriteBlocked)) - AnyClientsWriteBlocked = FALSE; + if (!XFD_ANYSET(&ClientsWriteBlocked) && NumNotifyWriteFd == 0) + AnyWritesPending = FALSE; + } if (oco->size > BUFWATERMARK) { |