diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-02-15 11:45:14 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-02-15 11:45:14 +0100 |
| commit | 24d7d0faa4b5c12c691599bf61bae5cfe1ef4120 (patch) | |
| tree | afec05c1ea5a1f9fcdc1a54f4d2b5050706e75c2 /nx-X11/programs/Xserver/hw/nxagent/Render.c | |
| parent | b61934be2e9b4a8d3112270b0e691d47f99ba39f (diff) | |
| parent | 586742b715a3e3451a4587439778c410a1970cdd (diff) | |
| download | nx-libs-24d7d0faa4b5c12c691599bf61bae5cfe1ef4120.tar.gz nx-libs-24d7d0faa4b5c12c691599bf61bae5cfe1ef4120.tar.bz2 nx-libs-24d7d0faa4b5c12c691599bf61bae5cfe1ef4120.zip | |
Merge branch 'uli42-pr/revert' into 3.6.x
Attributes GH PR #773: https://github.com/ArcticaProject/nx-libs/pull/773
Fixes ArcticaProject/nx-libs#772.
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Render.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Render.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/Render.c index 84c81a3f8..9d91b1ff1 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Render.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c @@ -569,11 +569,11 @@ int nxagentRenderRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor) nxagentMarkCorruptedRegion(pPicture -> pDrawable, NULL); - nxagentLosslessTrap = True; + nxagentLosslessTrap = 1; nxagentSynchronizeDrawable(pPicture -> pDrawable, DO_WAIT, NEVER_BREAK, NULL); - nxagentLosslessTrap = False; + nxagentLosslessTrap = 0; cid = XRenderCreateCursor(nxagentDisplay, nxagentPicture(pPicture), x, y); @@ -2741,7 +2741,7 @@ void nxagentReconnectGlyphSet(void* p0, XID x1, void *p2) int i; - if (!nxagentReconnectTrap) + if (nxagentReconnectTrap == 0) { #ifdef DEBUG fprintf(stderr, "nxagentReconnectGlyphSet: GlyphSet at [%p].\n", (void *) pGly); |