diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-01-15 16:27:32 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-01-15 16:27:32 +0100 |
| commit | faae65fb3693fd1020e740e00f9038607bc4a430 (patch) | |
| tree | 8ee59a2342f6320f9e8dc3e714b118e106f8d64d /nx-X11/programs/Xserver/hw/nxagent/Pixmap.c | |
| parent | d545afdf3967b0305c1215bb9f8a545b81fc24e8 (diff) | |
| parent | b44ecc0f897a5d03445aafc120e54b6475699254 (diff) | |
| download | nx-libs-faae65fb3693fd1020e740e00f9038607bc4a430.tar.gz nx-libs-faae65fb3693fd1020e740e00f9038607bc4a430.tar.bz2 nx-libs-faae65fb3693fd1020e740e00f9038607bc4a430.zip | |
Merge branch 'uli42-pr/rework_booleans_v2' into 3.6.x
Attributes GH PR #980: https://github.com/ArcticaProject/nx-libs/pull/980
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Pixmap.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Pixmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c index 13ac47d00..30e5d1e3f 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c @@ -200,7 +200,7 @@ PixmapPtr nxagentCreatePixmap(ScreenPtr pScreen, int width, int height, * checksum. */ - if (width != 0 && height != 0 && nxagentGCTrap == 0) + if (width != 0 && height != 0 && !nxagentGCTrap) { pPixmapPriv -> id = XCreatePixmap(nxagentDisplay, nxagentDefaultWindows[pScreen -> myNum], @@ -1064,7 +1064,7 @@ void nxagentSynchronizeShmPixmap(DrawablePtr pDrawable, int xPict, int yPict, int wPict, int hPict) { if (pDrawable -> type == DRAWABLE_PIXMAP && - nxagentIsShmPixmap((PixmapPtr) pDrawable) == 1) + nxagentIsShmPixmap((PixmapPtr) pDrawable)) { #ifdef TEST fprintf(stderr, "nxagentSynchronizeShmPixmap: WARNING! Synchronizing shared pixmap at [%p].\n", |