aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Pixels.h
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-05-22 00:50:51 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-05-22 00:50:51 +0200
commitfdaa240434e4b5022f2bc6b6aa7f590c0dcdc794 (patch)
tree316ac30721a364e72b4fddf9e3a21ceb81ef7547 /nx-X11/programs/Xserver/hw/nxagent/Pixels.h
parentfe72988fb668ad97fc4fcb2ee3862613324d9516 (diff)
parent222a4a22214608b7f89691eee1c57873c2631705 (diff)
downloadnx-libs-fdaa240434e4b5022f2bc6b6aa7f590c0dcdc794.tar.gz
nx-libs-fdaa240434e4b5022f2bc6b6aa7f590c0dcdc794.tar.bz2
nx-libs-fdaa240434e4b5022f2bc6b6aa7f590c0dcdc794.zip
Merge branch 'nxagent'
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Pixels.h')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Pixels.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixels.h b/nx-X11/programs/Xserver/hw/nxagent/Pixels.h
index 918d74dc7..4a02d80e5 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Pixels.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Pixels.h
@@ -134,7 +134,7 @@ FIXME: Changed macro: NXAGENT_SHOULD_DEFER_COMPOSITE
(nxagentOption(DeferLevel) == 1 && \
(pDst) -> pDrawable -> type == DRAWABLE_PIXMAP && \
(((pSrc) -> pDrawable && nxagentDrawableStatus((pSrc) -> pDrawable) == NotSynchronized) || \
- ((pMask) && nxagentDrawableStatus((pMask) -> pDrawable) == NotSynchronized))))
+ ((pMask) && (pMask) -> pDrawable && nxagentDrawableStatus((pMask) -> pDrawable) == NotSynchronized))))
#define NXAGENT_SHOULD_DEFER_PUTIMAGE(pDrawable) \